Merge tag 'block-6.16-20250710' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- MD changes via Yu:
- fix UAF due to stack memory used for bio mempool (Jinchao)
- fix raid10/raid1 nowait IO error path (Nigel and Qixing)
- fix kernel crash from reading bitmap sysfs entry (Håkon)
- Fix for a UAF in the nbd connect error path
- Fix for blocksize being bigger than pagesize, if THP isn't enabled
* tag 'block-6.16-20250710' of git://git.kernel.dk/linux:
block: reject bs > ps block devices when THP is disabled
nbd: fix uaf in nbd_genl_connect() error path
md/md-bitmap: fix GPF in bitmap_get_stats()
md/raid1,raid10: strip REQ_NOWAIT from member bios
raid10: cleanup memleak at raid10_make_request
md/raid1: Fix stack memory use after return in raid1_reshape
This commit is contained in:
@@ -269,11 +269,16 @@ static inline dev_t disk_devt(struct gendisk *disk)
|
||||
return MKDEV(disk->major, disk->first_minor);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
||||
/*
|
||||
* We should strive for 1 << (PAGE_SHIFT + MAX_PAGECACHE_ORDER)
|
||||
* however we constrain this to what we can validate and test.
|
||||
*/
|
||||
#define BLK_MAX_BLOCK_SIZE SZ_64K
|
||||
#else
|
||||
#define BLK_MAX_BLOCK_SIZE PAGE_SIZE
|
||||
#endif
|
||||
|
||||
|
||||
/* blk_validate_limits() validates bsize, so drivers don't usually need to */
|
||||
static inline int blk_validate_block_size(unsigned long bsize)
|
||||
|
||||
Reference in New Issue
Block a user