35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
From d884938c3eab2ca005180941c1dacf6e95f630cc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Date: Wed, 25 May 2016 16:01:29 +0530
|
||
|
|
Subject: [PATCH] scsi: megasas: use appropriate property buffer size
|
||
|
|
|
||
|
|
When setting MegaRAID SAS controller properties via MegaRAID
|
||
|
|
Firmware Interface(MFI) commands, a user supplied size parameter
|
||
|
|
is used to set property value. Use appropriate size value to avoid
|
||
|
|
OOB access issues.
|
||
|
|
|
||
|
|
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
||
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Message-Id: <1464172291-2856-2-git-send-email-ppandit@redhat.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
(cherry picked from commit 1b85898025c4cd95dce673d15e67e60e98e91731)
|
||
|
|
[BR:CVE-2016-5106 BSC#982018]
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/scsi/megasas.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
|
||
|
|
index a63a581..dcbd3e1 100644
|
||
|
|
--- a/hw/scsi/megasas.c
|
||
|
|
+++ b/hw/scsi/megasas.c
|
||
|
|
@@ -1446,7 +1446,7 @@ static int megasas_dcmd_set_properties(MegasasState *s, MegasasCmd *cmd)
|
||
|
|
dcmd_size);
|
||
|
|
return MFI_STAT_INVALID_PARAMETER;
|
||
|
|
}
|
||
|
|
- dma_buf_write((uint8_t *)&info, cmd->iov_size, &cmd->qsg);
|
||
|
|
+ dma_buf_write((uint8_t *)&info, dcmd_size, &cmd->qsg);
|
||
|
|
trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size);
|
||
|
|
return MFI_STAT_OK;
|
||
|
|
}
|