FAILED: patch "[PATCH] scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 93dde0bf2f39a0f9f57fd610aa3201ce5b753433
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026080556-pancake-criteria-119e@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 93dde0bf2f39a0f9f57fd610aa3201ce5b753433 Mon Sep 17 00:00:00 2001
From: Ibrahim Hashimov <[email protected]>
Date: Sun, 12 Jul 2026 20:37:39 +0200
Subject: [PATCH] scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB
write
resp_report_zones() sizes the reply buffer from the CDB allocation length. The v3 fix rounds alloc_len up with ALIGN() before deriving the descriptor count:
rep_max_zones = (ALIGN((u64)alloc_len, RZONES_DESC_HD) - RZONES_DESC_HD) >> ilog2(RZONES_DESC_HD); arr_len = (u64)RZONES_DESC_HD * (rep_max_zones + 1);
For alloc_len in 0xFFFFFFC1..0xFFFFFFFF, ALIGN() rounds up to 0x100000000, so arr_len is 4 GB. On 32-bit, kzalloc()'s size_t is 32-bit and truncates 0x100000000 to 0; kzalloc(0) returns ZERO_SIZE_PTR, which passes the !arr check, and desc = arr + 64 is then dereferenced in the loop -> out-of-bounds write / panic.
Clamp rep_max_zones to devip->nr_zones. The loop already stops at sdebug_capacity (after nr_zones zones), so a report can never hold more than nr_zones descriptors; the clamp does not change the report, it only bounds arr_len to (nr_zones + 1) * RZONES_DESC_HD, a real device property that can never reach 0x100000000.
drivers/scsi/scsi_debug.c +6 -2
@@ -5890,6 +5890,7 @@ static int resp_report_zones(struct scsi_cmnd *scp,u32 alloc_len, rep_opts, rep_len;bool partial;u64 lba, zs_lba; +u64 arr_len;u8 *arr =NULL , *desc;u8 *cmd = scp->cmnd;struct sdeb_zone_state *zsp =NULL ;
@@ -5911,9 +5912,12 @@ static int resp_report_zones(struct scsi_cmnd *scp,return check_condition_result; } - rep_max_zones = (alloc_len -64 ) >>ilog2 (RZONES_DESC_HD ); + rep_max_zones = (ALIGN ((u64 )alloc_len,RZONES_DESC_HD ) -RZONES_DESC_HD ) >> +ilog2 (RZONES_DESC_HD ); + rep_max_zones = min_t(unsigned int, rep_max_zones, devip->nr_zones); + arr_len = (u64 )RZONES_DESC_HD * (rep_max_zones +1 ); - arr =kzalloc (alloc_len,GFP_ATOMIC | __GFP_NOWARN); + arr =kzalloc (arr_len,GFP_ATOMIC | __GFP_NOWARN);if (!arr) {mk_sense_buffer (scp,ILLEGAL_REQUEST ,INSUFF_RES_ASC ,INSUFF_RES_ASCQ );
Sasha Levin
maintainerPATCH 1/6 scsi: sd: sd_zbc: Improve source code documentation
From: Bart Van Assche <[email protected]>
[ Upstream commit aa96bfb4caff59c93f0637092efe3a714cab0fe6 ]
Add several kernel-doc headers. Declare input arrays const. Specify the array size in function declarations.
Stable-dep-of: 93dde0bf2f39 ("scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write")
--- drivers/scsi/sd.h | 5 ++-- drivers/scsi/sd_zbc.c | 55 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 6 deletions(-)
drivers/scsi/sd.h +2 -3
@@ -217,7 +217,7 @@ static inline int sd_is_zoned(struct scsi_disk *sdkp)#ifdef CONFIG_BLK_DEV_ZONED void sd_zbc_release_disk (struct scsi_disk *sdkp); -int sd_zbc_read_zones (struct scsi_disk *sdkp,unsigned char *buffer); +int sd_zbc_read_zones (struct scsi_disk *sdkp,u8 buf[SD_BUF_SIZE ]);int sd_zbc_revalidate_zones (struct scsi_disk *sdkp);blk_status_t sd_zbc_setup_zone_mgmt_cmnd (struct scsi_cmnd *cmd,unsigned char op,bool all);
@@ -233,8 +233,7 @@ blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, sector_t *lba,static inline void sd_zbc_release_disk (struct scsi_disk *sdkp) {} -static inline int sd_zbc_read_zones (struct scsi_disk *sdkp, -unsigned char *buf) +static inline int sd_zbc_read_zones (struct scsi_disk *sdkp,u8 buf[SD_BUF_SIZE ]) {return 0 ; }
drivers/scsi/sd_zbc.c +52 -3
97 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/6 scsi: sd: sd_zbc: Use logical blocks as unit when querying zones
From: Damien Le Moal <[email protected]>
[ Upstream commit 43af5da09efb8abe450ec859d3063adeb7d1eb54 ]
When querying zones, track the position in logical blocks instead of in sectors. This change slightly simplifies sd_zbc_report_zones().
Stable-dep-of: 93dde0bf2f39 ("scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write")
--- drivers/scsi/sd_zbc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/scsi/sd_zbc.c +5 -6
@@ -223,7 +223,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, unsigned int nr_zones, report_zones_cb cb, void *data) { struct scsi_disk *sdkp = scsi_disk(disk); -sector_t capacity =logical_to_sectors (sdkp->device, sdkp->capacity); +sector_t lba =sectors_to_logical (sdkp->device, sector);unsigned int nr, i;unsigned char *buf;size_t offset, buflen =0 ;
@@ -234,7 +234,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector,/* Not a zoned device */ return -EOPNOTSUPP ; -if (!capacity) +if (!sdkp->capacity)/* Device gone or invalid */ return -ENODEV ;
@@ -242,9 +242,8 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector,if (!buf)return -ENOMEM ; -while (zone_idx < nr_zones && sector < capacity) { - ret =sd_zbc_do_report_zones (sdkp, buf, buflen, -sectors_to_logical (sdkp->device, sector), true); +while (zone_idx < nr_zones && lba < sdkp->capacity) { + ret =sd_zbc_do_report_zones (sdkp, buf, buflen, lba, true);if (ret) goto out;
@@ -262,7 +261,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, zone_idx++; } - sector +=sd_zbc_zone_sectors (sdkp) * i; + lba += sdkp->zone_blocks * i; } ret = zone_idx;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/6 scsi: sd: sd_zbc: Introduce struct zoned_disk_info
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 628617be8968e575ca0a0637fb227f8a990cb2f7 ]
Deriving the meaning of the nr_zones, rev_nr_zones, zone_blocks and rev_zone_blocks member variables requires careful analysis of the source code. Make the meaning of these member variables easier to understand by introducing struct zoned_disk_info.
Stable-dep-of: 93dde0bf2f39 ("scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write")
--- drivers/scsi/sd.h | 22 +++++++++++++++---- drivers/scsi/sd_zbc.c | 49 ++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 30 deletions(-)
drivers/scsi/sd.h +18 -4
@@ -67,6 +67,20 @@ enum { SD_ZERO_WS10_UNMAP, /* Use WRITE SAME(10) with UNMAP */ }; +/** +* struct zoned_disk_info - Specific properties of a ZBC SCSI device. +* @nr_zones: number of zones. +* @zone_blocks: number of logical blocks per zone. +* +* This data structure holds the ZBC SCSI device properties that are retrieved +* twice: a first time before the gendisk capacity is known and a second time +* after the gendisk capacity is known. +*/ +struct zoned_disk_info { +u32 nr_zones; +u32 zone_blocks; +}; +struct scsi_disk {struct scsi_driver *driver;/* always &sd_template */ struct scsi_device *device;
@@ -74,10 +88,10 @@ struct scsi_disk {struct gendisk *disk;struct opal_dev *opal_dev;#ifdef CONFIG_BLK_DEV_ZONED -u32 nr_zones; -u32 rev_nr_zones; -u32 zone_blocks; -u32 rev_zone_blocks; +/* Updated during revalidation before the gendisk capacity is known. */ +struct zoned_disk_info early_zone_info; +/* Updated during revalidation after the gendisk capacity is known. */ +struct zoned_disk_info zone_info;u32 zones_optimal_open;u32 zones_optimal_nonseq;u32 zones_max_open;
drivers/scsi/sd_zbc.c +23 -26
136 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/6 scsi: sd: sd_zbc: Return early in sd_zbc_check_zoned_characteristics()
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit 60caf3758103b8edc90724ba781ff119f739162a ]
Return early in sd_zbc_check_zoned_characteristics() for host-aware disks. This patch does not change any functionality but makes a later patch easier to read.
Stable-dep-of: 93dde0bf2f39 ("scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write")
--- drivers/scsi/sd_zbc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/scsi/sd_zbc.c +7 -6
@@ -593,14 +593,15 @@ static int sd_zbc_check_zoned_characteristics(struct scsi_disk *sdkp, sdkp->zones_optimal_open =get_unaligned_be32 (&buf[8 ]); sdkp->zones_optimal_nonseq =get_unaligned_be32 (&buf[12 ]); sdkp->zones_max_open =0 ; - }else { -/* Host-managed */ - sdkp->urswrz = buf[4 ] &1 ; - sdkp->zones_optimal_open =0 ; - sdkp->zones_optimal_nonseq =0 ; - sdkp->zones_max_open =get_unaligned_be32 (&buf[16 ]); +return 0 ; } +/* Host-managed */ + sdkp->urswrz = buf[4 ] &1 ; + sdkp->zones_optimal_open =0 ; + sdkp->zones_optimal_nonseq =0 ; + sdkp->zones_max_open =get_unaligned_be32 (&buf[16 ]); +/* * Check for unconstrained reads: host-managed devices with * constrained reads (drives failing read after write pointer)
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/6 scsi: scsi_debug: Rename zone type constants
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit 35dbe2b9a7b0c92777c855c6a2cca8390f4c166b ]
Rename the scsi_debug zone type constants to prevent a conflict with the ZBC_ZONE_TYPE_GAP constant from include/scsi/scsi_proto.h.
Stable-dep-of: 93dde0bf2f39 ("scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write")
--- drivers/scsi/scsi_debug.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/scsi_debug.c +9 -9
@@ -250,9 +250,9 @@ static const char *sdebug_version_date = "20200710";/* Zone types (zbcr05 table 25) */ enum sdebug_z_type { -ZBC_ZONE_TYPE_CNV =0x1 , -ZBC_ZONE_TYPE_SWR =0x2 , -ZBC_ZONE_TYPE_SWP =0x3 , +ZBC_ZTYPE_CNV =0x1 , +ZBC_ZTYPE_SWR =0x2 , +ZBC_ZTYPE_SWP =0x3 , };/* enumeration names taken from table 26, zbcr05 */
@@ -2682,7 +2682,7 @@ static struct sdeb_zone_state *zbc_zone(struct sdebug_dev_info *devip,static inline bool zbc_zone_is_conv (struct sdeb_zone_state *zsp) { -return zsp->z_type ==ZBC_ZONE_TYPE_CNV ; +return zsp->z_type ==ZBC_ZTYPE_CNV ; } static void zbc_close_zone(struct sdebug_dev_info *devip,
@@ -2781,7 +2781,7 @@ static void zbc_inc_wp(struct sdebug_dev_info *devip,if (zbc_zone_is_conv (zsp))return ; -if (zsp->z_type ==ZBC_ZONE_TYPE_SWR ) { +if (zsp->z_type ==ZBC_ZTYPE_SWR ) { zsp->z_wp += num;if (zsp->z_wp >= zend)zbc_set_zone_full (devip, zsp);
@@ -2848,7 +2848,7 @@ static int check_zbc_access_params(struct scsi_cmnd *scp,return 0 ; } -if (zsp->z_type ==ZBC_ZONE_TYPE_SWR ) { +if (zsp->z_type ==ZBC_ZTYPE_SWR ) {/* Writes cannot cross sequential zone boundaries */ if (zsp_end != zsp) { mk_sense_buffer(scp, ILLEGAL_REQUEST,
@@ -4934,14 +4934,14 @@ static int sdebug_device_create_zones(struct sdebug_dev_info *devip) zsp->z_start = zstart;if (i < devip->nr_conv_zones) { - zsp->z_type =ZBC_ZONE_TYPE_CNV ; + zsp->z_type =ZBC_ZTYPE_CNV ; zsp->z_cond =ZBC_NOT_WRITE_POINTER ; zsp->z_wp = (sector_t)-1 ; }else {if (devip->zmodel ==BLK_ZONED_HM ) - zsp->z_type =ZBC_ZONE_TYPE_SWR ; + zsp->z_type =ZBC_ZTYPE_SWR ;else - zsp->z_type =ZBC_ZONE_TYPE_SWP ; + zsp->z_type =ZBC_ZTYPE_SWP ; zsp->z_cond =ZC1_EMPTY ; zsp->z_wp = zsp->z_start; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/6 scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write
In reply to Sasha LevinFrom: Ibrahim Hashimov <[email protected]>
[ Upstream commit 93dde0bf2f39a0f9f57fd610aa3201ce5b753433 ]
resp_report_zones() sizes the reply buffer from the CDB allocation length. The v3 fix rounds alloc_len up with ALIGN() before deriving the descriptor count:
rep_max_zones = (ALIGN((u64)alloc_len, RZONES_DESC_HD) - RZONES_DESC_HD) >> ilog2(RZONES_DESC_HD); arr_len = (u64)RZONES_DESC_HD * (rep_max_zones + 1);
For alloc_len in 0xFFFFFFC1..0xFFFFFFFF, ALIGN() rounds up to 0x100000000, so arr_len is 4 GB. On 32-bit, kzalloc()'s size_t is 32-bit and truncates 0x100000000 to 0; kzalloc(0) returns ZERO_SIZE_PTR, which passes the !arr check, and desc = arr + 64 is then dereferenced in the loop -> out-of-bounds write / panic.
Clamp rep_max_zones to devip->nr_zones. The loop already stops at sdebug_capacity (after nr_zones zones), so a report can never hold more than nr_zones descriptors; the clamp does not change the report, it only bounds arr_len to (nr_zones + 1) * RZONES_DESC_HD, a real device property that can never reach 0x100000000.
--- drivers/scsi/scsi_debug.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +6 -3
@@ -4341,6 +4341,7 @@ static int resp_report_zones(struct scsi_cmnd *scp,u32 alloc_len, rep_opts, rep_len;bool partial;u64 lba, zs_lba; +u64 arr_len;u8 *arr =NULL , *desc;u8 *cmd = scp->cmnd;struct sdeb_zone_state *zsp;
@@ -4364,10 +4365,12 @@ static int resp_report_zones(struct scsi_cmnd *scp, } max_zones = devip->nr_zones - (zs_lba >> devip->zsize_shift); - rep_max_zones =min ((alloc_len -64 ) >>ilog2 (RZONES_DESC_HD ), - max_zones); + rep_max_zones = (ALIGN ((u64 )alloc_len,RZONES_DESC_HD ) -RZONES_DESC_HD ) >> +ilog2 (RZONES_DESC_HD ); + rep_max_zones = min_t(unsigned int, rep_max_zones, max_zones); + arr_len = (u64 )RZONES_DESC_HD * (rep_max_zones +1 ); - arr =kzalloc (alloc_len,GFP_ATOMIC | __GFP_NOWARN); + arr =kzalloc (arr_len,GFP_ATOMIC | __GFP_NOWARN);if (!arr) {mk_sense_buffer (scp,ILLEGAL_REQUEST ,INSUFF_RES_ASC ,INSUFF_RES_ASCQ );
Signature · 1 line
2.53.0