Skip to contentSkip to conversation

s390/dasd: fix use after free

PATCH Applied Stefan Haberland 2 participants 3 messages Aug 4, 2021

Subsystems (3)
lore
Share & tools
lore

Stefan Haberland

author maintainer
#0 lore raw

cover s390/dasd: fix use after free

Hi Jens,

please apply the following patch that fixes an use after free error in the DASD driver.

Stefan Haberland (1):
s390/dasd: fix use after free in dasd path handling

 drivers/s390/block/dasd_eckd.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH 1/1 s390/dasd: fix use after free in dasd path handling

When new configuration data is obtained after a path event it is stored in the per path array. The old data needs to be freed.
The first valid configuration data is also referenced in the device private structure to identify the device.
When the old per path configuration data was freed the device still pointed to the already freed data leading to a use after free.

Fix by replacing also the device configuration data with the newly obtained one before the old data gets freed.

Fixes 460181217a24 ("s390/dasd: Store path configuration data during path handling")
---
 drivers/s390/block/dasd_eckd.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/s390/block/dasd_eckd.c +11 -2
index 0de1a463c509..fb5d8152652d 100644
@@ -1004,15 +1004,23 @@ static unsigned char dasd_eckd_path_access(void *conf_data, int conf_len)
 static void dasd_eckd_store_conf_data(struct dasd_device *device,
 				      struct dasd_conf_data *conf_data, int chp)
 {
+	struct dasd_eckd_private *private = device->private;
 	struct channel_path_desc_fmt0 *chp_desc;
 	struct subchannel_id sch_id;
+	void *cdp;
 
-	ccw_device_get_schid(device->cdev, &sch_id);
 	/*
 	 * path handling and read_conf allocate data
 	 * free it before replacing the pointer
+	 * also replace the old private->conf_data pointer
+	 * with the new one if this points to the same data
 	 */
-	kfree(device->path[chp].conf_data);
+	cdp = device->path[chp].conf_data;
+	if (private->conf_data == cdp) {
+		private->conf_data = (void *)conf_data;
+		dasd_eckd_identify_conf_parts(private);
+	}
+	ccw_device_get_schid(device->cdev, &sch_id);
 	device->path[chp].conf_data = conf_data;
 	device->path[chp].cssid = sch_id.cssid;
 	device->path[chp].ssid = sch_id.ssid;
@@ -1020,6 +1028,7 @@ static void dasd_eckd_store_conf_data(struct dasd_device *device,
 	if (chp_desc)
 		device->path[chp].chpid = chp_desc->chpid;
 	kfree(chp_desc);
+	kfree(cdp);
 }
 
 static void dasd_eckd_clear_conf_data(struct dasd_device *device)
Signature · 1 line
2.25.1
maintainer Applied
#2 lore raw
In reply to Stefan Haberland
Quoted 10 lines · Stefan Haberland

Hi Jens,

please apply the following patch that fixes an use after free error in the DASD driver.

Stefan Haberland (1):
s390/dasd: fix use after free in dasd path handling

 drivers/s390/block/dasd_eckd.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Applied, thanks.

Signature · 1 line
Jens Axboe