linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tong Zhang <ztong0001@gmail.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
	Sagi Grimberg <sagi@grimberg.me>,
	linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nvme: fix use-after-free during booting
Date: Tue, 22 Sep 2020 11:40:56 -0400	[thread overview]
Message-ID: <CAA5qM4DvFdQ_yvkGERyNjar7EJkcRmR5ry9BiuPaZkEzzO=Mug@mail.gmail.com> (raw)
In-Reply-To: <20200922135956.GA23437@lst.de>

Thank you Christoph.
I will do some testing with my setup and let you know.
- Tong

On Tue, Sep 22, 2020 at 9:59 AM Christoph Hellwig <hch@lst.de> wrote:
>
> Hi Tong,
>
> can you test this patch?
>
> diff --git a/block/genhd.c b/block/genhd.c
> index 99c64641c3148c..6473ae703789e4 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -836,6 +836,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
>          * so that it sticks around as long as @disk is there.
>          */
>         WARN_ON_ONCE(!blk_get_queue(disk->queue));
> +       disk->flags |= GENHD_FL_QUEUE_REF;
>
>         disk_add_events(disk);
>         blk_integrity_add(disk);
> @@ -1567,7 +1568,7 @@ static void disk_release(struct device *dev)
>         kfree(disk->random);
>         disk_replace_part_tbl(disk, NULL);
>         hd_free_part(&disk->part0);
> -       if (disk->queue)
> +       if (disk->flags & GENHD_FL_QUEUE_REF)
>                 blk_put_queue(disk->queue);
>         kfree(disk);
>  }
> diff --git a/include/linux/genhd.h b/include/linux/genhd.h
> index 4ab853461dff25..9441077ee10329 100644
> --- a/include/linux/genhd.h
> +++ b/include/linux/genhd.h
> @@ -135,6 +135,7 @@ struct hd_struct {
>  #define GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE    0x0100
>  #define GENHD_FL_NO_PART_SCAN                  0x0200
>  #define GENHD_FL_HIDDEN                                0x0400
> +#define GENHD_FL_QUEUE_REF                     0x0800
>
>  enum {
>         DISK_EVENT_MEDIA_CHANGE                 = 1 << 0, /* media changed */

  reply	other threads:[~2020-09-22 15:41 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-16 15:36 [PATCH] nvme: fix use-after-free during booting Tong Zhang
2020-09-17  8:26 ` Christoph Hellwig
2020-09-17 15:24   ` Tong Zhang
2020-09-17 15:26     ` Christoph Hellwig
2020-09-22 13:59 ` Christoph Hellwig
2020-09-22 15:40   ` Tong Zhang [this message]
     [not found]   ` <CAA5qM4BPKZaqH0SHS3zCO7oz=f3Ow_zB2fqtJYUrbbFBNbWsNQ@mail.gmail.com>
     [not found]     ` <20200922164154.GA1894@lst.de>
2020-09-22 20:34       ` Tong Zhang
2020-09-23  5:06         ` Christoph Hellwig
2020-09-23 16:40           ` Tong Zhang
2020-09-23  5:57         ` Christoph Hellwig
2020-09-23 16:32           ` Tong Zhang

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='CAA5qM4DvFdQ_yvkGERyNjar7EJkcRmR5ry9BiuPaZkEzzO=Mug@mail.gmail.com' \
    --to=ztong0001@gmail.com \
    --cc=axboe@fb.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /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).