Skip to content

Commit 265e98f

Browse files
SurajSonawane2415weiny2
authored andcommitted
acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl
Fix an issue detected by syzbot with KASAN: BUG: KASAN: vmalloc-out-of-bounds in cmd_to_func drivers/acpi/nfit/ core.c:416 [inline] BUG: KASAN: vmalloc-out-of-bounds in acpi_nfit_ctl+0x20e8/0x24a0 drivers/acpi/nfit/core.c:459 The issue occurs in cmd_to_func when the call_pkg->nd_reserved2 array is accessed without verifying that call_pkg points to a buffer that is appropriately sized as a struct nd_cmd_pkg. This can lead to out-of-bounds access and undefined behavior if the buffer does not have sufficient space. To address this, a check was added in acpi_nfit_ctl() to ensure that buf is not NULL and that buf_len is less than sizeof(*call_pkg) before accessing it. This ensures safe access to the members of call_pkg, including the nd_reserved2 array. Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=7534f060ebda6b8b51b3 Tested-by: [email protected] Fixes: ebe9f6f ("acpi/nfit: Fix bus command validation") Signed-off-by: Suraj Sonawane <[email protected]> Reviewed-by: Alison Schofield <[email protected]> Reviewed-by: Dave Jiang <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Ira Weiny <[email protected]>
1 parent 40384c8 commit 265e98f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/acpi/nfit/core.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,13 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
454454
if (cmd_rc)
455455
*cmd_rc = -EINVAL;
456456

457-
if (cmd == ND_CMD_CALL)
457+
if (cmd == ND_CMD_CALL) {
458+
if (!buf || buf_len < sizeof(*call_pkg))
459+
return -EINVAL;
460+
458461
call_pkg = buf;
462+
}
463+
459464
func = cmd_to_func(nfit_mem, cmd, call_pkg, &family);
460465
if (func < 0)
461466
return func;

0 commit comments

Comments
 (0)