diff mbox series

block: check minor range in device_add_disk()

Message ID b1b19379-23ee-5379-0eb5-94bf5f79f1b4@i-love.sakura.ne.jp (mailing list archive)
State New, archived
Headers show
Series block: check minor range in device_add_disk() | expand

Commit Message

Tetsuo Handa Dec. 17, 2021, 2:51 p.m. UTC 
ioctl(fd, LOOP_CTL_ADD, 1048576) causes

  sysfs: cannot create duplicate filename '/dev/block/7:0'

message because such request is treated as if ioctl(fd, LOOP_CTL_ADD, 0)
due to MINORMASK == 1048575. Verify that all minor numbers for that device
fit in the minor range.

Reported-by: wangyangbo <wangyangbo@uniontech.com>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---
 block/genhd.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Christoph Hellwig Dec. 21, 2021, 4:19 p.m. UTC | #1 
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
Jens Axboe Dec. 21, 2021, 4:34 p.m. UTC | #2 
On Fri, 17 Dec 2021 23:51:25 +0900, Tetsuo Handa wrote:
> ioctl(fd, LOOP_CTL_ADD, 1048576) causes
> 
>   sysfs: cannot create duplicate filename '/dev/block/7:0'
> 
> message because such request is treated as if ioctl(fd, LOOP_CTL_ADD, 0)
> due to MINORMASK == 1048575. Verify that all minor numbers for that device
> fit in the minor range.
> 
> [...]

Applied, thanks!

[1/1] block: check minor range in device_add_disk()
      commit: e338924bd05d6e71574bc13e310c89e10e49a8a5

Best regards,
diff mbox series

Patch

diff --git a/block/genhd.c b/block/genhd.c
index 30362aeacac4..b6a278f54f34 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -425,6 +425,8 @@  int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 				DISK_MAX_PARTS);
 			disk->minors = DISK_MAX_PARTS;
 		}
+		if (disk->first_minor + disk->minors > MINORMASK + 1)
+			return -EINVAL;
 	} else {
 		if (WARN_ON(disk->minors))
 			return -EINVAL;