From 68353e273feaeabea942a8eaeeebda9412574dec Mon Sep 17 00:00:00 2001 From: attilio Date: Thu, 21 May 2009 13:22:07 +0000 Subject: Move the M_WAITOK flag in notify() into an M_NOWAIT one in order to match the behaviour alredy present with the further malloc() call in devctl_notify(). This fixes a bug in the CAM layer where the camisr handler finished to call camperiphfree() (and subsequently destroy_dev() resulting in a new dev notify) while the xpt lock is held. PR: kern/130330 Tested by: Riccardo Torrini --- sys/kern/kern_conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sys/kern/kern_conf.c') diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 61488e9..284f482 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -491,7 +491,9 @@ notify(struct cdev *dev, const char *ev) if (cold) return; namelen = strlen(dev->si_name); - data = malloc(namelen + sizeof(prefix), M_TEMP, M_WAITOK); + data = malloc(namelen + sizeof(prefix), M_TEMP, M_NOWAIT); + if (data == NULL) + return; memcpy(data, prefix, sizeof(prefix) - 1); memcpy(data + sizeof(prefix) - 1, dev->si_name, namelen + 1); devctl_notify("DEVFS", "CDEV", ev, data); -- cgit v1.1