lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 19 Jun 2013 15:21:52 +0800 From: Ming Lei <ming.lei@...onical.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Greg KH <greg@...ah.com>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Takashi Iwai <tiwai@...e.de> Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree On Wed, Jun 19, 2013 at 3:12 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi Greg, > > On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote: >> >> Today's linux-next merge of the driver-core tree got a conflict in >> drivers/base/firmware_class.c between commit 875979368eb4 ("firmware >> loader: fix use-after-free by double abort") from the driver-core.current >> tree and commit fe304143b0c3 ("firmware: Avoid deadlock of usermodehelper >> lock at shutdown") from the driver-core tree. >> >> I fixed it up (more may be required - see below) and can carry the fix as >> necessary (no action is required). > > I missed the bit below (at least) and have now added this as a merge fix > for the driver-core tree. I think it is OK to merge, then I can add the 'more' part about the original fix(875979368eb4) against today's change. > > From: Stephen Rothwell <sfr@...b.auug.org.au> > Date: Wed, 19 Jun 2013 17:08:01 +1000 > Subject: [PATCH] fix up for fw_load_abort API change > > Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au> > --- > drivers/base/firmware_class.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c > index 57aa842..fdacd77 100644 > --- a/drivers/base/firmware_class.c > +++ b/drivers/base/firmware_class.c > @@ -812,7 +812,7 @@ static void firmware_class_timeout_work(struct work_struct *work) > struct firmware_priv, timeout_work.work); > > mutex_lock(&fw_lock); > - fw_load_abort(fw_priv); > + fw_load_abort(fw_priv->buf); > mutex_unlock(&fw_lock); > } > > -- > 1.8.1 > > -- > Cheers, > Stephen Rothwell sfr@...b.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists