From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ming Lei <ming.lei@canonical.com>, Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Wed, 19 Jun 2013 17:12:21 +1000 [thread overview]
Message-ID: <20130619171221.bedfb8f5c3c9819decc01edc@canb.auug.org.au> (raw)
In-Reply-To: <20130619153225.9ff68f0984bfa54333c4df10@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1481 bytes --]
Hi Greg,
On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell <sfr@canb.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.
From: Stephen Rothwell <sfr@canb.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@canb.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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-06-19 7:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 5:32 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2013-06-19 5:55 ` Greg KH
2013-06-19 6:58 ` Ming Lei
2013-06-19 14:39 ` Greg KH
2013-06-19 15:04 ` Ming Lei
2013-06-19 16:36 ` Greg KH
2013-06-20 0:23 ` Ming Lei
2013-06-20 1:06 ` Stephen Rothwell
2013-06-20 1:22 ` Ming Lei
2013-06-20 3:28 ` Greg KH
2013-06-20 3:46 ` Ming Lei
2013-06-20 3:49 ` Stephen Rothwell
2013-06-19 7:12 ` Stephen Rothwell [this message]
2013-06-19 7:21 ` Ming Lei
-- strict thread matches above, loose matches on Subject: below --
2020-04-30 4:25 Stephen Rothwell
2020-04-30 8:15 ` Greg KH
2013-12-09 3:47 Stephen Rothwell
2013-12-09 8:21 ` Greg KH
2012-02-03 3:51 Stephen Rothwell
2012-02-03 15:07 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130619171221.bedfb8f5c3c9819decc01edc@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).