Commit 9530f1fc authored by Li Lingfeng's avatar Li Lingfeng
Browse files

Revert "scsi: ses: fix slab-out-of-bounds in ses_enclosure_data_process" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9K8D1


CVE: NA

--------------------------------

This reverts commit d77d7bbc.

Backport mainline patches(584892fd29a4
"scsi: ses: Fix possible desc_ptr out-of-bounds accesses") to replace it.

Fixes: d77d7bbc ("scsi: ses: fix slab-out-of-bounds in ses_enclosure_data_process")
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 76dda4fa

drivers/scsi/ses.c

+3 −3
Original line number Diff line number Diff line
@@ -569,11 +569,11 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, 
			int max_desc_len;



			if (desc_ptr) {

				len = (desc_ptr[2] << 8) + desc_ptr[3];

				desc_ptr += 4;

				if (desc_ptr + len > buf + page7_len) {

				if (desc_ptr >= buf + page7_len) {

					desc_ptr = NULL;

				} else {

					len = (desc_ptr[2] << 8) + desc_ptr[3];

					desc_ptr += 4;

					/* Add trailing zero - pushes into

					 * reserved space */

					desc_ptr[len] = '\0';