svn commit: r246113 - head/sys/dev/usb/controller

Hans Petter Selasky hselasky at FreeBSD.org
Wed Jan 30 07:48:44 UTC 2013


Author: hselasky
Date: Wed Jan 30 07:48:43 2013
New Revision: 246113
URL: http://svnweb.freebsd.org/changeset/base/246113

Log:
  Add missing NULL pointer check.
  
  Reported by:	Lars Engels
  MFC after:	1 week

Modified:
  head/sys/dev/usb/controller/xhci.c

Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c	Wed Jan 30 06:37:18 2013	(r246112)
+++ head/sys/dev/usb/controller/xhci.c	Wed Jan 30 07:48:43 2013	(r246113)
@@ -886,6 +886,12 @@ xhci_check_transfer(struct xhci_softc *s
 			 * a short packet also makes the transfer done
 			 */
 			if (td->remainder > 0) {
+				if (td->alt_next == NULL) {
+					DPRINTF("short TD has no "
+					    "alternate next\n");
+					xhci_generic_done(xfer);
+					break;
+				}
 				DPRINTF("TD has short pkt\n");
 				if (xfer->flags_int.short_frames_ok ||
 				    xfer->flags_int.isochronous_xfr ||


More information about the svn-src-all mailing list