Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two bug fixes, one to fix a potential information leak in the BPF jit
and common-io-layer fix for old firmware levels"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/bpf,jit: initialize A register if 1st insn is BPF_S_LDX_B_MSH
s390/chsc: fix SEI usage on old FW levels
+17
-6
-1
arch/s390/net/bpf_jit_comp.c
-1
arch/s390/net/bpf_jit_comp.c
+17
-5
drivers/s390/cio/chsc.c
+17
-5
drivers/s390/cio/chsc.c
···
541
541
542
542
static void chsc_process_event_information(struct chsc_sei *sei, u64 ntsm)
543
543
{
544
-
do {
544
+
static int ntsm_unsupported;
545
+
546
+
while (true) {
545
547
memset(sei, 0, sizeof(*sei));
546
548
sei->request.length = 0x0010;
547
549
sei->request.code = 0x000e;
548
-
sei->ntsm = ntsm;
550
+
if (!ntsm_unsupported)
551
+
sei->ntsm = ntsm;
549
552
550
553
if (chsc(sei))
551
554
break;
552
555
553
556
if (sei->response.code != 0x0001) {
554
-
CIO_CRW_EVENT(2, "chsc: sei failed (rc=%04x)\n",
555
-
sei->response.code);
557
+
CIO_CRW_EVENT(2, "chsc: sei failed (rc=%04x, ntsm=%llx)\n",
558
+
sei->response.code, sei->ntsm);
559
+
560
+
if (sei->response.code == 3 && sei->ntsm) {
561
+
/* Fallback for old firmware. */
562
+
ntsm_unsupported = 1;
563
+
continue;
564
+
}
556
565
break;
557
566
}
558
567
···
577
568
CIO_CRW_EVENT(2, "chsc: unhandled nt: %d\n", sei->nt);
578
569
break;
579
570
}
580
-
} while (sei->u.nt0_area.flags & 0x80);
571
+
572
+
if (!(sei->u.nt0_area.flags & 0x80))
573
+
break;
574
+
}
581
575
}
582
576
583
577
/*