From: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: axboe@kernel.dk, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, skhan@linuxfoundation.org,
gregkh@linuxfoundation.org,
linux-kernel-mentees@lists.linuxfoundation.org,
syzbot+6a8a0d93c91e8fbf2e80@syzkaller.appspotmail.com,
miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com,
linux-mtd@lists.infradead.org
Subject: Re: [PATCH] block: break circular locks in blk_request_module
Date: Thu, 17 Jun 2021 23:23:36 +0800 [thread overview]
Message-ID: <ce1567cf-bc94-790c-cfc0-e4e429e1a86a@gmail.com> (raw)
In-Reply-To: <YMs3O/cg4V7ywlVq@infradead.org>
On 17/6/21 7:51 pm, Christoph Hellwig wrote:
> On Thu, Jun 17, 2021 at 05:20:16PM +0800, Desmond Cheong Zhi Xi wrote:
>> mutex_lock(&major_names_lock);
>> for (n = &major_names[major_to_index(major)]; *n; n = &(*n)->next) {
>> if ((*n)->major == major && (*n)->probe) {
>> - (*n)->probe(devt);
>> + probe = (*n)->probe;
>> mutex_unlock(&major_names_lock);
>> + probe(devt);
>
> And now you can all probe after it has been freed and/or the module has
> been unloaded. The obviously correct fix is to only hold mtd_table_mutex
> for the actually required critical section:
>
Thank you for the correction, Christoph. I hadn't thought of the
scenario where the module is unloaded. I'll be more conscientious in the
future.
> diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
> index fb8e12d590a1..065d94f9b1fb 100644
> --- a/drivers/mtd/mtd_blkdevs.c
> +++ b/drivers/mtd/mtd_blkdevs.c
> @@ -529,13 +529,11 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
> register_mtd_user(&blktrans_notifier);
>
>
> - mutex_lock(&mtd_table_mutex);
>
> ret = register_blkdev(tr->major, tr->name);
> if (ret < 0) {
> printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n",
> tr->name, tr->major, ret);
> - mutex_unlock(&mtd_table_mutex);
> return ret;
> }
>
> @@ -545,12 +543,12 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
> tr->blkshift = ffs(tr->blksize) - 1;
>
> INIT_LIST_HEAD(&tr->devs);
> - list_add(&tr->list, &blktrans_majors);
>
> + mutex_lock(&mtd_table_mutex);
> + list_add(&tr->list, &blktrans_majors);
> mtd_for_each_device(mtd)
> if (mtd->type != MTD_ABSENT)
> tr->add_mtd(tr, mtd);
> -
> mutex_unlock(&mtd_table_mutex);
> return 0;
> }
>
This fix passes the Syzkaller repro test on my local machine and on
Syzbot. I can prepare a v2 patch for this. May I include you with the
Co-developed-by: and Signed-off-by: tags? If another tag would be more
appropriate, or if you want to submit the patch yourself, please let me
know.
Best wishes,
Desmond
next prev parent reply other threads:[~2021-06-17 15:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 9:20 [PATCH] block: break circular locks in blk_request_module Desmond Cheong Zhi Xi
2021-06-17 11:51 ` Christoph Hellwig
2021-06-17 15:23 ` Desmond Cheong Zhi Xi [this message]
2021-06-17 15:27 ` Christoph Hellwig
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=ce1567cf-bc94-790c-cfc0-e4e429e1a86a@gmail.com \
--to=desmondcheongzx@gmail.com \
--cc=axboe@kernel.dk \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=skhan@linuxfoundation.org \
--cc=syzbot+6a8a0d93c91e8fbf2e80@syzkaller.appspotmail.com \
--cc=vigneshr@ti.com \
/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).