From 18e54d23a8052c6319a91bea51ad793e67cb5380 Mon Sep 17 00:00:00 2001 From: Zheng Qixing Date: Mon, 3 Nov 2025 19:46:52 +0800 Subject: [PATCH 1/2] Revert "scsi: ses: fix slab-out-of-bounds in ses_enclosure_data_process" hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ID0VIE CVE: CVE-2023-53675 ------------------ This reverts commit b101167f2bf44a2ac20382e0c9ba42b205146d2d. Backport the patch from mainline. Fixes: b101167f2bf4 ("scsi: ses: fix slab-out-of-bounds in ses_enclosure_data_process") Signed-off-by: Zheng Qixing --- drivers/scsi/ses.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 76c17d73e9d4..651899733dfa 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c @@ -558,11 +558,11 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, struct enclosure_component *ecomp; 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'; -- Gitee From 6cb397f8519a7071d06dbd593096a0c07af65216 Mon Sep 17 00:00:00 2001 From: Tomas Henzl Date: Mon, 3 Nov 2025 19:46:53 +0800 Subject: [PATCH 2/2] scsi: ses: Fix possible desc_ptr out-of-bounds accesses stable inclusion from stable-v4.19.276 commit cffe09ca0555e235a42d6fa065e463c4b3d5b657 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ID0VIE CVE: CVE-2023-53675 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cffe09ca0555e235a42d6fa065e463c4b3d5b657 ------------------ 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 Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman Conflicts: drivers/scsi/ses.c [Context conflicts.] Signed-off-by: Zheng Qixing --- drivers/scsi/ses.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 651899733dfa..6ef1e12a2fce 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c @@ -558,15 +558,19 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, struct enclosure_component *ecomp; if (desc_ptr) { - if (desc_ptr >= buf + page7_len) { + if (desc_ptr + 3 >= 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'; - name = desc_ptr; + if (desc_ptr + len > buf + page7_len) + desc_ptr = NULL; + else { + /* Add trailing zero - pushes into + * reserved space */ + desc_ptr[len] = '\0'; + name = desc_ptr; + } } } if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE || -- Gitee