Skip to content

Commit 1b60741

Browse files
oberparVasily Gorbik
authored andcommitted
s390/cio: fix out-of-bounds access on cio_ignore free
The channel-subsystem-driver scans for newly available devices whenever device-IDs are removed from the cio_ignore list using a command such as: echo free >/proc/cio_ignore Since an I/O device scan might interfer with running I/Os, commit 172da89 ("s390/cio: avoid excessive path-verification requests") introduced an optimization to exclude online devices from the scan. The newly added check for online devices incorrectly assumes that an I/O-subchannel's drvdata points to a struct io_subchannel_private. For devices that are bound to a non-default I/O subchannel driver, such as the vfio_ccw driver, this results in an out-of-bounds read access during each scan. Fix this by changing the scan logic to rely on a driver-independent online indication. For this we can use struct subchannel->config.ena, which is the driver's requested subchannel-enabled state. Since I/Os can only be started on enabled subchannels, this matches the intent of the original optimization of not scanning devices where I/O might be running. Fixes: 172da89 ("s390/cio: avoid excessive path-verification requests") Fixes: 0c3812c ("s390/cio: derive cdev information only for IO-subchannels") Cc: <[email protected]> # v5.15 Reported-by: Alexander Egorenkov <[email protected]> Reviewed-by: Vineeth Vijayan <[email protected]> Signed-off-by: Peter Oberparleiter <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 8b1e6a3 commit 1b60741

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/s390/cio/css.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -753,13 +753,9 @@ static int __unset_online(struct device *dev, void *data)
753753
{
754754
struct idset *set = data;
755755
struct subchannel *sch = to_subchannel(dev);
756-
struct ccw_device *cdev;
757756

758-
if (sch->st == SUBCHANNEL_TYPE_IO) {
759-
cdev = sch_get_cdev(sch);
760-
if (cdev && cdev->online)
761-
idset_sch_del(set, sch->schid);
762-
}
757+
if (sch->st == SUBCHANNEL_TYPE_IO && sch->config.ena)
758+
idset_sch_del(set, sch->schid);
763759

764760
return 0;
765761
}

0 commit comments

Comments
 (0)