ACK/Cmnt: [SRU][F][PATCH 1/1] acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl

[Stefan Bader]

On 23.05.25 11:01, Massimiliano Pellizzer wrote:
> From: Suraj Sonawane <surajsonawane0215 at gmail.com>
> 
> 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: syzbot+7534f060ebda6b8b51b3 at syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=7534f060ebda6b8b51b3
> Tested-by: syzbot+7534f060ebda6b8b51b3 at syzkaller.appspotmail.com
> Fixes: ebe9f6f19d80 ("acpi/nfit: Fix bus command validation")
> Signed-off-by: Suraj Sonawane <surajsonawane0215 at gmail.com>
> Reviewed-by: Alison Schofield <alison.schofield at intel.com>
> Reviewed-by: Dave Jiang <dave.jiang at intel.com>
> Link: https://patch.msgid.link/20241118162609.29063-1-surajsonawane0215@gmail.com
> Signed-off-by: Ira Weiny <ira.weiny at intel.com>
> (backported from commit 265e98f72bac6c41a4492d3e30a8e5fd22fe0779)
> [mpellizzer: context adjusted due to missing commit:
> - 6450ddbd5d8e ACPI: NFIT: Define runtime firmware activation commands
> which adds a parameter to the function cmd_to_func().]

I tend to fix multi-line notes by having one space before any 
continuation line on backport notes. I saw this being brought up as 
flagged by the checker but would be ok to get fixed when applying.

> CVE-2024-56662
> Signed-off-by: Massimiliano Pellizzer <massimiliano.pellizzer at canonical.com>

Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>   drivers/acpi/nfit/core.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 793b8d9d749a0..d8f1f591f86f3 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -454,8 +454,13 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
>   	if (cmd_rc)
>   		*cmd_rc = -EINVAL;
>   
> -	if (cmd == ND_CMD_CALL)
> +	if (cmd == ND_CMD_CALL) {
> +		if (!buf || buf_len < sizeof(*call_pkg))
> +			return -EINVAL;
> +
>   		call_pkg = buf;
> +	}
> +
>   	func = cmd_to_func(nfit_mem, cmd, call_pkg);
>   	if (func < 0)
>   		return func;


-- 
- Stefan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0xE8675DEECBEECEA3.asc
Type: application/pgp-keys
Size: 47863 bytes
Desc: OpenPGP public key
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20250523/07d4f2ec/attachment-0001.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20250523/07d4f2ec/attachment-0001.sig>