2023-01-19 12:24:00

by Heiko Carstens

[permalink] [raw]
Subject: [GIT PULL] s390 compile fix for 6.2-rc5

Hello Linus,

please pull a single compile fix for 6.2-rc5.

Thanks,
Heiko

The following changes since commit 1ecf7bd9c267ab85aff3c4a17fe56bc9754a13be:

s390: update defconfigs (2023-01-11 21:26:40 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.2-3

for you to fetch changes up to 41e1992665a2701fa025a8b76970c43b4148446f:

s390: workaround invalid gcc-11 out of bounds read warning (2023-01-17 19:00:59 +0100)

----------------------------------------------------------------
s390 compile fix for 6.2-rc5

- 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.

----------------------------------------------------------------
Heiko Carstens (1):
s390: workaround invalid gcc-11 out of bounds read warning

arch/s390/kernel/setup.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 2b6091349daa..696c9e007a36 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -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);
}


2023-01-20 05:53:00

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] s390 compile fix for 6.2-rc5

The pull request you sent on Thu, 19 Jan 2023 13:16:49 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.2-3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a03df4ec37291de74987e4fbfbbcaebb5a8f9a2e

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html