This is a note to let you know that I've just added the patch titled
s390/cio: check the subchannel validity for dev_busid
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s390-cio-check-the-subchannel-validity-for-dev_busid.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a4751f157c194431fae9e9c493f456df8272b871 Mon Sep 17 00:00:00 2001
From: Vineeth Vijayan <vneethv@xxxxxxxxxxxxx>
Date: Fri, 5 Nov 2021 16:44:51 +0100
Subject: s390/cio: check the subchannel validity for dev_busid
From: Vineeth Vijayan <vneethv@xxxxxxxxxxxxx>
commit a4751f157c194431fae9e9c493f456df8272b871 upstream.
Check the validity of subchanel before reading other fields in
the schib.
Fixes: d3683c055212 ("s390/cio: add dev_busid sysfs entry for each subchannel")
CC: <stable@xxxxxxxxxxxxxxx>
Reported-by: Cornelia Huck <cohuck@xxxxxxxxxx>
Signed-off-by: Vineeth Vijayan <vneethv@xxxxxxxxxxxxx>
Reviewed-by: Cornelia Huck <cohuck@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20211105154451.847288-1-vneethv@xxxxxxxxxxxxx
Signed-off-by: Vasily Gorbik <gor@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/s390/cio/css.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -437,8 +437,8 @@ static ssize_t dev_busid_show(struct dev
struct subchannel *sch = to_subchannel(dev);
struct pmcw *pmcw = &sch->schib.pmcw;
- if ((pmcw->st == SUBCHANNEL_TYPE_IO ||
- pmcw->st == SUBCHANNEL_TYPE_MSG) && pmcw->dnv)
+ if ((pmcw->st == SUBCHANNEL_TYPE_IO && pmcw->dnv) ||
+ (pmcw->st == SUBCHANNEL_TYPE_MSG && pmcw->w))
return sysfs_emit(buf, "0.%x.%04x\n", sch->schid.ssid,
pmcw->dev);
else
Patches currently in stable-queue which might be from vneethv@xxxxxxxxxxxxx are
queue-5.15/s390-cio-check-the-subchannel-validity-for-dev_busid.patch
queue-5.15/s390-cio-make-ccw_device_dma_-more-robust.patch
