xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: ses: Fix possible desc_ptr out-of-bounds accesses

Browse Source 
commit 801ab13d50cf3d26170ee073ea8bb4eececb76ab upstream.

Sanitize possible desc_ptr out-of-bounds accesses in
ses_enclosure_data_process().

Link: https://lore.kernel.org/r/20230202162451.15346-4-thenzl@redhat.com
Cc: stable@vger.kernel.org
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Henzl
2023-02-02 17:24:50 +01:00
committed by Greg Kroah-Hartman
parent 2ecd344173
commit c315560e3e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/ses.c
View File

@@ -572,17 +572,21 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
int max_desc_len; int max_desc_len;
if (desc_ptr) { if (desc_ptr) {
if (desc_ptr >= buf + page7_len) { if (desc_ptr + 3 >= buf + page7_len) {
desc_ptr = NULL; desc_ptr = NULL;
} else { } else {
len = (desc_ptr[2] << 8) + desc_ptr[3]; len = (desc_ptr[2] << 8) + desc_ptr[3];
desc_ptr += 4; desc_ptr += 4;
if (desc_ptr + len > buf + page7_len)
desc_ptr = NULL;
else {
/* Add trailing zero - pushes into /* Add trailing zero - pushes into
* reserved space */ * reserved space */
desc_ptr[len] = '\0'; desc_ptr[len] = '\0';
name = desc_ptr; name = desc_ptr;
} }
} }
}
if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE || if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE ||
type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE) { type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE) {