diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-20 13:37:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-20 13:37:58 -0800 |
| commit | 11167b29e53b9a06635309445ead7edfd54e6616 (patch) | |
| tree | dcce6411b09ea57feb7cd11ff8e76841b6558142 /drivers | |
| parent | 7c05bd92305d13e18945270b7bfaf300d53f6ed2 (diff) | |
| parent | 85672ca9ceeaa1dcf2777a7048af5f4aee3fd02b (diff) | |
| download | lwn-11167b29e53b9a06635309445ead7edfd54e6616.tar.gz lwn-11167b29e53b9a06635309445ead7edfd54e6616.zip | |
Merge tag 'block-6.13-20241220' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- Minor cleanups for bdev/nvme using the helpers introduced
- Revert of a deadlock fix that still needs more work
- Fix a UAF of hctx in the cpu hotplug code
* tag 'block-6.13-20241220' of git://git.kernel.dk/linux:
block: avoid to reuse `hctx` not removed from cpuhp callback list
block: Revert "block: Fix potential deadlock while freezing queue and acquiring sysfs_lock"
nvme: use blk_validate_block_size() for max LBA check
block/bdev: use helper for max block size check
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index d169a30eb935..a970168a3014 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2034,7 +2034,7 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, * or smaller than a sector size yet, so catch this early and don't * allow block I/O. */ - if (head->lba_shift > PAGE_SHIFT || head->lba_shift < SECTOR_SHIFT) { + if (blk_validate_block_size(bs)) { bs = (1 << 9); valid = false; } |