Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390 fixes for 6.2-rc7

Browse Source 
- With CONFIG_VMAP_STACK enabled it is not possible to load the s390
   specific diag288_wdt watchdog module. Reason is that a pointer to a
   string is passed to an inline assembly; this string however is located on
   the stack, while the instruction within the inline assembly expects a
   physicial address. Fix this by copying the string to a kmalloc'ed buffer.
 
 - The diag288_wdt watchdog module does not indicate that it accesses memory
   from an inline assembly, which it does. Add "memory" to the clobber list
   to prevent the compiler from optimizing code incorrectly away.
 
 - Pass size of the uncompressed kernel image to __decompress() call.
   Otherwise the kernel image decompressor may corrupt/overwrite an
   initrd. This was reported to happen on s390 after commit 2aa14b1ab2
   ("zstd: import usptream v1.5.2").
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEECMNfWEw3SLnmiLkZIg7DeRspbsIFAmPbwHcACgkQIg7DeRsp
 bsIpVBAAjMwQ7VC5tQnW6ZZVyJuVs2sHTWhaUkPKasSQ95N/5pa1BObmA33mU7nv
 4XSAMJ+ajWZEPIB9D4UEZgCWOXbNPxEP7Bs7mMEzKExETW0Atooy/iNXUGLM126x
 hP/PorVWl1a6W9v/Q6W8rnQrneW8d5R/2830FSe6q30Z+faPWh22NgLzQ4iihuPQ
 KLOchN+4OnMnQl0P9F6Hg1s0gPU/iOzKuUfHvKGZ2A/29uIymPKna5p2eUoeAQ0O
 46pNUMnU/1kqtwLCZSdSdLQ0YhPOcFZ1/1T4mYxpEJ2ZjyWVOvkxHf0nNSJ2j9Pm
 mdyvPqwuuEIm7aTvOPM4WI7kjdsdswgKEP6/ZoAw8IhHwry/DayWwXYsmiqUZ5FU
 09YYhgXEVHox91j8bFY4oMJ2DJ1BoFzQ13tFApboO1gsSn2cfQgBO6Fw0KUz7pL6
 pmdL98VYwMKlqc5Xn0iidIo0hgpA/Vf1cdUrHvpZz+lvzO4tna31+0Q1FaQgT79Q
 l15NTRi4MgP5uDxbi/2AxMRkM+xsYPmHM79m6nmn/zRyaQzHhTcwVuB4yqlSiVuQ
 wV7jPAf1lEX48k7ZMDmPZjkABVax+iiF24+XwQIqcZm/PNGv6yRAH1pKMdl9wH4R
 Fnr+15on0L/8o2uUE+A4HLhApM3ZYekvy41XaHJ5Ac0Hlsr9EEY=
 =+HFX
 -----END PGP SIGNATURE-----

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

Pull s390 fixes from Heiko Carstens:

 - With CONFIG_VMAP_STACK enabled it is not possible to load the s390
   specific diag288_wdt watchdog module. The reason is that a pointer to
   a string is passed to an inline assembly; this string however is
   located on the stack, while the instruction within the inline
   assembly expects a physicial address. Fix this by copying the string
   to a kmalloc'ed buffer.

 - The diag288_wdt watchdog module does not indicate that it accesses
   memory from an inline assembly, which it does. Add "memory" to the
   clobber list to prevent the compiler from optimizing code incorrectly
   away.

 - Pass size of the uncompressed kernel image to __decompress() call.
   Otherwise the kernel image decompressor may corrupt/overwrite an
   initrd. This was reported to happen on s390 after commit 2aa14b1ab2
   ("zstd: import usptream v1.5.2").

* tag 's390-6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/decompressor: specify __decompress() buf len to avoid overflow
  watchdog: diag288_wdt: fix __diag288() inline assembly
  watchdog: diag288_wdt: do not use stack buffers for hardware data
This commit is contained in:
Linus Torvalds 2023-02-02 12:52:47 -08:00
commit addfba11b3
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/boot/decompressor.c
View File

@ -80,6 +80,6 @@ void *decompress_kernel(void)
void *output = (void *)decompress_offset;
__decompress(_compressed_start, _compressed_end - _compressed_start,
NULL, NULL, output, 0, NULL, error);
NULL, NULL, output, vmlinux.image_size, NULL, error);
return output;
}

15
drivers/watchdog/diag288_wdt.c
View File

@ -86,7 +86,7 @@ static int __diag288(unsigned int func, unsigned int timeout,
"1:\n"
EX_TABLE(0b, 1b)
: "+d" (err) : "d"(__func), "d"(__timeout),
"d"(__action), "d"(__len) : "1", "cc");
"d"(__action), "d"(__len) : "1", "cc", "memory");
return err;
}
@ -268,12 +268,21 @@ static int __init diag288_init(void)
char ebc_begin[] = {
194, 197, 199, 201, 213
};
char *ebc_cmd;
watchdog_set_nowayout(&wdt_dev, nowayout_info);
if (MACHINE_IS_VM) {
if (__diag288_vm(WDT_FUNC_INIT, 15,
ebc_begin, sizeof(ebc_begin)) != 0) {
ebc_cmd = kmalloc(sizeof(ebc_begin), GFP_KERNEL);
if (!ebc_cmd) {
pr_err("The watchdog cannot be initialized\n");
return -ENOMEM;
}
memcpy(ebc_cmd, ebc_begin, sizeof(ebc_begin));
ret = __diag288_vm(WDT_FUNC_INIT, 15,
ebc_cmd, sizeof(ebc_begin));
kfree(ebc_cmd);
if (ret != 0) {
pr_err("The watchdog cannot be initialized\n");
return -EINVAL;
}