svn commit: r216391 - head/sys/fs/devfs

Jaakko Heinonen jh at FreeBSD.org
Sun Dec 12 08:52:13 UTC 2010


Author: jh
Date: Sun Dec 12 08:52:13 2010
New Revision: 216391
URL: http://svn.freebsd.org/changeset/base/216391

Log:
  Handle the special ruleset 0 in devfs_ruleset_use(). An attempt set the
  current ruleset to 0 with command "devfs ruleset 0" triggered a KASSERT
  in devfs_ruleset_create().
  
  PR:		kern/125030
  Submitted by:	Mateusz Guzik

Modified:
  head/sys/fs/devfs/devfs_rule.c

Modified: head/sys/fs/devfs/devfs_rule.c
==============================================================================
--- head/sys/fs/devfs/devfs_rule.c	Sun Dec 12 06:00:26 2010	(r216390)
+++ head/sys/fs/devfs/devfs_rule.c	Sun Dec 12 08:52:13 2010	(r216391)
@@ -742,6 +742,11 @@ devfs_ruleset_use(devfs_rsnum rsnum, str
 		devfs_ruleset_reap(cds);
 	}
 
+	if (rsnum == 0) {
+		dm->dm_ruleset = 0;
+		return (0);
+	}
+
 	ds = devfs_ruleset_bynum(rsnum);
 	if (ds == NULL)
 		ds = devfs_ruleset_create(rsnum);


More information about the svn-src-head mailing list