Skip to content

Commit d76b14f

Browse files
eaibmzVasily Gorbik
authored andcommitted
s390/sclp: fix Secure-IPL facility detection
Prevent out-of-range access if the returned SCLP SCCB response is smaller in size than the address of the Secure-IPL flag. Fixes: c9896ac ("s390/ipl: Provide has_secure sysfs attribute") Cc: stable@vger.kernel.org # 5.2+ Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent a8b92b8 commit d76b14f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/s390/char/sclp_early.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ static void __init sclp_early_facilities_detect(void)
4545
sclp.has_gisaf = !!(sccb->fac118 & 0x08);
4646
sclp.has_hvs = !!(sccb->fac119 & 0x80);
4747
sclp.has_kss = !!(sccb->fac98 & 0x01);
48-
sclp.has_sipl = !!(sccb->cbl & 0x4000);
4948
if (sccb->fac85 & 0x02)
5049
S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
5150
if (sccb->fac91 & 0x40)
5251
S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST;
5352
if (sccb->cpuoff > 134)
5453
sclp.has_diag318 = !!(sccb->byte_134 & 0x80);
54+
if (sccb->cpuoff > 137)
55+
sclp.has_sipl = !!(sccb->cbl & 0x4000);
5556
sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
5657
sclp.rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
5758
sclp.rzm <<= 20;

0 commit comments

Comments
 (0)