From: Jan Kara <jack@suse.cz>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Jens Axboe <axboe@kernel.dk>, Hannes Reinecke <hare@suse.de>,
Jan Kara <jack@suse.cz>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-block@vger.kernel.org, Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH] block: Fix the maximum minor value is blk_alloc_ext_minor()
Date: Mon, 28 Mar 2022 10:20:40 +0200 [thread overview]
Message-ID: <20220328082040.h7pmagyaacttxhda@quack3.lan> (raw)
In-Reply-To: <cc17199798312406b90834e433d2cefe8266823d.1648306232.git.christophe.jaillet@wanadoo.fr>
On Sat 26-03-22 15:50:46, Christophe JAILLET wrote:
> ida_alloc_range(..., min, max, ...) returns values from min to max,
> inclusive.
>
> So, NR_EXT_DEVT is a valid idx returned by blk_alloc_ext_minor().
>
> This is an issue because in device_add_disk(), this value is used in:
> ddev->devt = MKDEV(disk->major, disk->first_minor);
> and NR_EXT_DEVT is '(1 << MINORBITS)'.
>
> So, should 'disk->first_minor' be NR_EXT_DEVT, it would overflow.
>
> Fixes: 22ae8ce8b892 ("block: simplify bdev/disk lookup in blkdev_get")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Indeed. The patch looks good to me so feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
> ---
> #define MKDEV(ma,mi) (((ma) << MINORBITS) | (mi))
>
> This patch is completely speculative, but it seems that idr_alloc() and
> ida_alloc_range() don't have the same semantic regarding the upper bound.
> idr_alloc() looks exclusive, while ida_alloc_range() is inclusive.
>
> We changed from the first one to the other one in the commit in Fixes:.
Yes, this difference is really a landmine. Matthew, why is the semantics of
max parameter for idr_alloc() different from ida_alloc_range() or say
idr_alloc_u32()? It is really easy to introduce subtle bugs with this...
Honza
> ---
> block/genhd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/genhd.c b/block/genhd.c
> index c9a4fc90d3e9..b8b6759d670f 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -335,7 +335,7 @@ int blk_alloc_ext_minor(void)
> {
> int idx;
>
> - idx = ida_alloc_range(&ext_devt_ida, 0, NR_EXT_DEVT, GFP_KERNEL);
> + idx = ida_alloc_range(&ext_devt_ida, 0, NR_EXT_DEVT - 1, GFP_KERNEL);
> if (idx == -ENOSPC)
> return -EBUSY;
> return idx;
> --
> 2.32.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2022-03-28 8:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-26 14:50 [PATCH] block: Fix the maximum minor value is blk_alloc_ext_minor() Christophe JAILLET
2022-03-28 8:20 ` Jan Kara [this message]
2022-03-28 12:36 ` Jens Axboe
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=20220328082040.h7pmagyaacttxhda@quack3.lan \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=christophe.jaillet@wanadoo.fr \
--cc=hare@suse.de \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=willy@infradead.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;
as well as URLs for NNTP newsgroup(s).