projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32f71f3
)
s390/cio: check the subchannel validity for dev_busid
author
Vineeth Vijayan
<vneethv@linux.ibm.com>
Fri, 5 Nov 2021 15:44:51 +0000
(16:44 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:17:17 +0000
(19:17 +0100)
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@vger.kernel.org>
Reported-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Link:
https://lore.kernel.org/r/20211105154451.847288-1-vneethv@linux.ibm.com
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/s390/cio/css.c
patch
|
blob
|
history
diff --git
a/drivers/s390/cio/css.c
b/drivers/s390/cio/css.c
index
4446192
..
c278097
100644
(file)
--- a/
drivers/s390/cio/css.c
+++ b/
drivers/s390/cio/css.c
@@
-437,8
+437,8
@@
static ssize_t dev_busid_show(struct device *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