cxl/mbox: Clamp mailbox output allocation to the payload size
PATCH v2 1/1 cxl/mbox: Clamp mailbox output allocation to the payload size
CXL_MEM_SEND_COMMAND bounds the user's in.size to the mailbox payload size but leaves out.size unbounded, then cxl_mbox_cmd_ctor() calls kvzalloc(out.size). A large out.size drives a huge allocation, above INT_MAX it WARNs and taints, and with panic_on_warn=1 it panics.
The transport __cxl_pci_mbox_send_cmd() already clamps the response copy to min(out.size, payload_size, device len), so the output buffer is never written beyond payload_size. Clamp the allocation to payload_size too, matching the RAW path.
---
Changelog:
v1 -> v2:
- Correct the Fixes tag to 583fa5e71cae ("cxl/mem: Add basic IOCTL interface")
- Drop the reproducer and sent it as a regression test in ndctl
Best regards,
Richard Cheng.
--- drivers/cxl/core/mbox.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/cxl/core/mbox.c +1 -5
@@ -380,11 +380,7 @@ static int cxl_mbox_cmd_ctor(struct cxl_mbox_cmd *mbox_cmd, } } -/* Prepare to handle a full payload for variable sized output */ -if (out_size ==CXL_VARIABLE_PAYLOAD ) - mbox_cmd->size_out = cxl_mbox->payload_size; -else - mbox_cmd->size_out = out_size; + mbox_cmd->size_out =min_t (size_t, out_size, cxl_mbox->payload_size);if (mbox_cmd->size_out) { mbox_cmd->payload_out =kvzalloc (mbox_cmd->size_out,GFP_KERNEL );
base-commit: ef0c9f75a19532d7675384708fc8621e10850104
Signature · 1 line
2.43.0
Quoted 48 lines · Richard Cheng
CXL_MEM_SEND_COMMANDbounds the user's in.size to the mailbox payload size but leaves out.size unbounded, thencxl_mbox_cmd_ctor()calls kvzalloc(out.size). A large out.size drives a huge allocation, aboveINT_MAXit WARNs and taints, and with panic_on_warn=1 it panics.The transport
__cxl_pci_mbox_send_cmd()already clamps the response copy tomin(out.size, payload_size, device len), so the output buffer is never written beyondpayload_size. Clamp the allocation topayload_sizetoo, matching the RAW path.Fixes 583fa5e71cae ("cxl/mem: Add basic IOCTL interface")Reviewed-by Kai-Heng Feng <[email protected]>Reviewed-by Koba Ko <[email protected]>Reviewed-by Dave Jiang <[email protected]>Reviewed-by Davidlohr Bueso <[email protected]>Signed-off-by Richard Cheng <[email protected]>---
Changelog:v1 -> v2:
- Correct the Fixes tag to583fa5e71cae("cxl/mem: Add basic IOCTL interface")
- Drop the reproducer and sent it as a regression test in ndctlBest regards,
Richard Cheng.--- drivers/cxl/core/mbox.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/cxl/core/mbox.c +1
-5@@ -380,11 +380,7 @@ static int cxl_mbox_cmd_ctor(struct cxl_mbox_cmd *mbox_cmd, } } -/* Prepare to handle a full payload for variable sized output */ -if (out_size ==CXL_VARIABLE_PAYLOAD ) - mbox_cmd->size_out = cxl_mbox->payload_size; -else - mbox_cmd->size_out = out_size; + mbox_cmd->size_out =min_t (size_t, out_size, cxl_mbox->payload_size);if (mbox_cmd->size_out) { mbox_cmd->payload_out =kvzalloc (mbox_cmd->size_out,GFP_KERNEL );
Quoted 4 lines
base-commit:
ef0c9f75a19532d7675384708fc8621e10850104Signature · 1 line
2.43.0
Hi folks,
Just a gentle ping on this one, I've tweak the commit message and send ndctl patch for it.
Please take a look while you're available, thanks.
Best regards,
Richard Cheng
Quoted 10 lines · Richard Cheng
CXL_MEM_SEND_COMMANDbounds the user's in.size to the mailbox payload size but leaves out.size unbounded, thencxl_mbox_cmd_ctor()calls kvzalloc(out.size). A large out.size drives a huge allocation, aboveINT_MAXit WARNs and taints, and with panic_on_warn=1 it panics.The transport
__cxl_pci_mbox_send_cmd()already clamps the response copy tomin(out.size, payload_size, device len), so the output buffer is never written beyondpayload_size. Clamp the allocation topayload_sizetoo, matching the RAW path.
Quoted 6 lines
Fixes 583fa5e71cae ("cxl/mem: Add basic IOCTL interface")Reviewed-by Kai-Heng Feng <[email protected]>Reviewed-by Koba Ko <[email protected]>Reviewed-by Dave Jiang <[email protected]>Reviewed-by Davidlohr Bueso <[email protected]>Signed-off-by Richard Cheng <[email protected]>
Applied to next8a13db9f899d
Quoted 33 lines
---
Changelog:v1 -> v2:
- Correct the Fixes tag to583fa5e71cae("cxl/mem: Add basic IOCTL interface")
- Drop the reproducer and sent it as a regression test in ndctlBest regards,
Richard Cheng.--- drivers/cxl/core/mbox.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/cxl/core/mbox.c +1
-5@@ -380,11 +380,7 @@ static int cxl_mbox_cmd_ctor(struct cxl_mbox_cmd *mbox_cmd, } } -/* Prepare to handle a full payload for variable sized output */ -if (out_size ==CXL_VARIABLE_PAYLOAD ) - mbox_cmd->size_out = cxl_mbox->payload_size; -else - mbox_cmd->size_out = out_size; + mbox_cmd->size_out =min_t (size_t, out_size, cxl_mbox->payload_size);if (mbox_cmd->size_out) { mbox_cmd->payload_out =kvzalloc (mbox_cmd->size_out,GFP_KERNEL );base-commit:
ef0c9f75a19532d7675384708fc8621e10850104