Commit a03df4ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 build fix from Heiko Carstens:

 - Workaround invalid gcc-11 out of bounds read warning caused by s390's
   S390_lowcore definition. This happens only with gcc 11.1.0 and
   11.2.0.

   The code which causes this warning will be gone with the next merge
   window. Therefore just replace the memcpy() with a for loop to get
   rid of the warning.

* tag 's390-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: workaround invalid gcc-11 out of bounds read warning
parents 46f0cba3 41e19926

arch/s390/kernel/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ static void __init setup_lowcore_dat_on(void) 
{

	struct lowcore *abs_lc;

	unsigned long flags;

	int i;



	__ctl_clear_bit(0, 28);

	S390_lowcore.external_new_psw.mask |= PSW_MASK_DAT;
@@ -523,8 +524,8 @@ static void __init setup_lowcore_dat_on(void) 
	abs_lc = get_abs_lowcore(&flags);

	abs_lc->restart_flags = RESTART_FLAG_CTLREGS;

	abs_lc->program_new_psw = S390_lowcore.program_new_psw;

	memcpy(abs_lc->cregs_save_area, S390_lowcore.cregs_save_area,

	       sizeof(abs_lc->cregs_save_area));

	for (i = 0; i < 16; i++)

		abs_lc->cregs_save_area[i] = S390_lowcore.cregs_save_area[i];

	put_abs_lowcore(abs_lc, flags);

}