public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <jthumshirn@suse.de>
To: Ming Lei <ming.lei@canonical.com>
Cc: Jens Axboe <axboe@fb.com>,
	linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
	Christoph Hellwig <hch@infradead.org>,
	Naveen Kaje <nkaje@codeaurora.org>,
	stable@vger.kernel.org, linux-block-owner@vger.kernel.org
Subject: Re: [PATCH v1] block: partition: initialize percpuref before new partition is visiable
Date: Thu, 31 Mar 2016 10:15:16 +0200	[thread overview]
Message-ID: <22ca270520aa88a3e1312bb6af033a3e@suse.de> (raw)
In-Reply-To: <1459392027-10266-1-git-send-email-ming.lei@canonical.com>

On 2016-03-31 04:40, Ming Lei wrote:
> The initialization of partition's percpu_ref should have been done 
> before
> the new partition is updated to partition table via
> rcu_assign_pointer(), otherwise the uninitialized percpu_ref may be 
> accessed
> in data path.
> 
> This patch fixes this issue reported by Naveen.
> 
> Reported-by: Naveen Kaje <nkaje@codeaurora.org>
> Tested-by: Naveen Kaje <nkaje@codeaurora.org>
> Fixes: 6c71013ecb7e2(block: partition: convert percpu ref)
> Cc: <stable@vger.kernel.org> # v4.3+
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
> ---
> V1:
> 	- put 'if' around the actual device_remove_file at the label
> 	as suggested by Christoph
> 	- make commit log more accurate
> 
>  block/partition-generic.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/block/partition-generic.c b/block/partition-generic.c
> index 5d87019..54d4be8 100644
> --- a/block/partition-generic.c
> +++ b/block/partition-generic.c
> @@ -361,15 +361,17 @@ struct hd_struct *add_partition(struct gendisk
> *disk, int partno,
>  			goto out_del;
>  	}
> 
> +	err = hd_ref_init(p);
> +	if (err)
> +		goto out_remove_file;
> +
>  	/* everything is up and running, commence */
>  	rcu_assign_pointer(ptbl->part[partno], p);
> 
>  	/* suppress uevent if the disk suppresses it */
>  	if (!dev_get_uevent_suppress(ddev))
>  		kobject_uevent(&pdev->kobj, KOBJ_ADD);
> -
> -	if (!hd_ref_init(p))
> -		return p;
> +	return p;
> 
>  out_free_info:
>  	free_part_info(p);
> @@ -378,6 +380,9 @@ out_free_stats:
>  out_free:
>  	kfree(p);
>  	return ERR_PTR(err);
> +out_remove_file:
> +	if (flags & ADDPART_FLAG_WHOLEDISK)
> +		device_remove_file(pdev, &dev_attr_whole_disk);
>  out_del:
>  	kobject_put(p->holder_dir);
>  	device_del(pdev);

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>

      parent reply	other threads:[~2016-03-31  8:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-31  2:40 [PATCH v1] block: partition: initialize percpuref before new partition is visiable Ming Lei
2016-03-31  7:44 ` Christoph Hellwig
2016-03-31  8:15 ` Johannes Thumshirn [this message]

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=22ca270520aa88a3e1312bb6af033a3e@suse.de \
    --to=jthumshirn@suse.de \
    --cc=axboe@fb.com \
    --cc=hch@infradead.org \
    --cc=linux-block-owner@vger.kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ming.lei@canonical.com \
    --cc=nkaje@codeaurora.org \
    --cc=stable@vger.kernel.org \
    /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