Skip to content

Commit 4254dfe

Browse files
leitaomartinkpetersen
authored andcommitted
scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory
There is a potential out-of-bounds access when using test_bit() on a single word. The test_bit() and set_bit() functions operate on long values, and when testing or setting a single word, they can exceed the word boundary. KASAN detects this issue and produces a dump: BUG: KASAN: slab-out-of-bounds in _scsih_add_device.constprop.0 (./arch/x86/include/asm/bitops.h:60 ./include/asm-generic/bitops/instrumented-atomic.h:29 drivers/scsi/mpt3sas/mpt3sas_scsih.c:7331) mpt3sas Write of size 8 at addr ffff8881d26e3c60 by task kworker/u1536:2/2965 For full log, please look at [1]. Make the allocation at least the size of sizeof(unsigned long) so that set_bit() and test_bit() have sufficient room for read/write operations without overwriting unallocated memory. [1] Link: https://lore.kernel.org/all/ZkNcALr3W3KGYYJG@gmail.com/ Fixes: c696f7b ("scsi: mpt3sas: Implement device_remove_in_progress check in IOCTL path") Cc: stable@vger.kernel.org Suggested-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Breno Leitao <leitao@debian.org> Link: https://lore.kernel.org/r/20240605085530.499432-1-leitao@debian.org Reviewed-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 7926d51 commit 4254dfe

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

drivers/scsi/mpt3sas/mpt3sas_base.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8512,6 +8512,12 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
85128512
ioc->pd_handles_sz = (ioc->facts.MaxDevHandle / 8);
85138513
if (ioc->facts.MaxDevHandle % 8)
85148514
ioc->pd_handles_sz++;
8515+
/*
8516+
* pd_handles_sz should have, at least, the minimal room for
8517+
* set_bit()/test_bit(), otherwise out-of-memory touch may occur.
8518+
*/
8519+
ioc->pd_handles_sz = ALIGN(ioc->pd_handles_sz, sizeof(unsigned long));
8520+
85158521
ioc->pd_handles = kzalloc(ioc->pd_handles_sz,
85168522
GFP_KERNEL);
85178523
if (!ioc->pd_handles) {
@@ -8529,6 +8535,13 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
85298535
ioc->pend_os_device_add_sz = (ioc->facts.MaxDevHandle / 8);
85308536
if (ioc->facts.MaxDevHandle % 8)
85318537
ioc->pend_os_device_add_sz++;
8538+
8539+
/*
8540+
* pend_os_device_add_sz should have, at least, the minimal room for
8541+
* set_bit()/test_bit(), otherwise out-of-memory may occur.
8542+
*/
8543+
ioc->pend_os_device_add_sz = ALIGN(ioc->pend_os_device_add_sz,
8544+
sizeof(unsigned long));
85328545
ioc->pend_os_device_add = kzalloc(ioc->pend_os_device_add_sz,
85338546
GFP_KERNEL);
85348547
if (!ioc->pend_os_device_add) {
@@ -8820,6 +8833,12 @@ _base_check_ioc_facts_changes(struct MPT3SAS_ADAPTER *ioc)
88208833
if (ioc->facts.MaxDevHandle % 8)
88218834
pd_handles_sz++;
88228835

8836+
/*
8837+
* pd_handles should have, at least, the minimal room for
8838+
* set_bit()/test_bit(), otherwise out-of-memory touch may
8839+
* occur.
8840+
*/
8841+
pd_handles_sz = ALIGN(pd_handles_sz, sizeof(unsigned long));
88238842
pd_handles = krealloc(ioc->pd_handles, pd_handles_sz,
88248843
GFP_KERNEL);
88258844
if (!pd_handles) {

0 commit comments

Comments
 (0)