Skip to content

Commit 61d099a

Browse files
LivelyCarpet87martinkpetersen
authored andcommitted
scsi: ibmvfc: Fix OOB access in ibmvfc_discover_targets_done()
A malicious or compromised VIO server can return a num_written value in the discover targets MAD response that exceeds max_targets. This value is stored directly in vhost->num_targets without validation, and is then used as the loop bound in ibmvfc_alloc_targets() to index into disc_buf[], which is only allocated for max_targets entries. Indices at or beyond max_targets access kernel memory outside the DMA-coherent allocation. The out-of-bounds data is subsequently embedded in Implicit Logout and PLOGI MADs that are sent back to the VIO server, leaking kernel memory. Fix by clamping num_written to max_targets before storing it. Fixes: 072b91f ("[SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver") Reported-by: Yuhao Jiang <[email protected]> Cc: [email protected] Signed-off-by: Tyllis Xu <[email protected]> Reviewed-by: Dave Marquardt <[email protected]> Acked-by: Tyrel Datwyler <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 7a9f448 commit 61d099a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/scsi/ibmvscsi/ibmvfc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4966,7 +4966,8 @@ static void ibmvfc_discover_targets_done(struct ibmvfc_event *evt)
49664966
switch (mad_status) {
49674967
case IBMVFC_MAD_SUCCESS:
49684968
ibmvfc_dbg(vhost, "Discover Targets succeeded\n");
4969-
vhost->num_targets = be32_to_cpu(rsp->num_written);
4969+
vhost->num_targets = min_t(u32, be32_to_cpu(rsp->num_written),
4970+
max_targets);
49704971
ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_ALLOC_TGTS);
49714972
break;
49724973
case IBMVFC_MAD_FAILED:

0 commit comments

Comments
 (0)