On Thu, May 21, 2009 at 01:22:07PM +0000, Attilio Rao wrote: > Author: attilio > Date: Thu May 21 13:22:07 2009 > New Revision: 192535 > URL: http://svn.freebsd.org/changeset/base/192535 > > Log: > 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. This is wrong. You cannot call destroy_dev() while holding any mutex. Taking this into account, it makes no sense to use M_NOWAIT in notify().
>
> PR: kern/130330
> Tested by: Riccardo Torrini <riccardo dot torrini at esaote dot com>
>
> Modified:
> head/sys/kern/kern_conf.c
>
> Modified: head/sys/kern/kern_conf.c
> ==============================================================================
> --- head/sys/kern/kern_conf.c Thu May 21 12:36:40 2009 (r192534)
> +++ head/sys/kern/kern_conf.c Thu May 21 13:22:07 2009 (r192535)
> @@ -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);
pgp6esqL5X02e.pgp
Description: PGP signature
