svn commit: r230696 - stable/8/sys/kern

Marius Strobl marius at FreeBSD.org
Sun Jan 29 00:41:09 UTC 2012


Author: marius
Date: Sun Jan 29 00:41:08 2012
New Revision: 230696
URL: http://svn.freebsd.org/changeset/base/230696

Log:
  MFC: r226175
  
  In device_get_children() avoid malloc(0) in order to increase portability
  to other operating systems.
  
  PR:	154287

Modified:
  stable/8/sys/kern/subr_bus.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/subr_bus.c
==============================================================================
--- stable/8/sys/kern/subr_bus.c	Sun Jan 29 00:40:39 2012	(r230695)
+++ stable/8/sys/kern/subr_bus.c	Sun Jan 29 00:41:08 2012	(r230696)
@@ -2176,6 +2176,11 @@ device_get_children(device_t dev, device
 	TAILQ_FOREACH(child, &dev->children, link) {
 		count++;
 	}
+	if (count == 0) {
+		*devlistp = NULL;
+		*devcountp = 0;
+		return (0);
+	}
 
 	list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT|M_ZERO);
 	if (!list)


More information about the svn-src-stable-8 mailing list