UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Xtensa fixes for v6.3: 

- fix KASAN report in show_stack
 - drop linux-xtensa mailing list from the MAINTAINERS file
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmQhtOUTHGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRGomD/9ACw5EfmmrnTwKoJkpiBW/SAMz5D/d
 /pnO85uic7rehl9ub4B5ITIMu9/Op9NMcSL3EXM7o0jVr205EiWlX9G73VDBDe5L
 GQ7jZCUBghW28hNruC0rNz2YlsXO0xJZpExP6jwuREKmWb2am6tpgCaMalZcI5P6
 ILto4qSsHS+WAkOVn4QHZr+W9QjVNIIoTVxlQ+AjAjBfCY76EfbgwgsMWkV0BKeE
 C+zGwHMjpghGViV4dzmFmKwNrrz+j5cCwJGePJv+juD0bGp0CqSeWEbssZUWKVkX
 EQIZPlREx5eVVQ1MtUNT+6xOOGs9rupRaAbNqx8hs1+AHCbKmZaf9aERGyep6Fhv
 yi/cs9KgQhg8fev8dN6RvD+waWkueWxK3WjRB+MVJ4nfOpguH9derKL2epq6uVHV
 Z39/fFIeYQ4esAtrTduWYwmDjRExFF22HubYhBnvfBdA/55QWIMVf6v9ZO/rTu5L
 /aWBrstWNyZIOtDQi/CU+dpos7H8PpEsWXQpllyyH6m1Z+qVNnjmVnV2J4InMktE
 eJ01HuLnf88sJGaQDyFVYE684Leg5FY14TkPYdF22tEaBosZgFlaDGPTeC5gYRHT
 cz8cT5B2ytGriwb5Pgig7bLXDvEFaVuVm9+2e6N6NzsC881WsmC/zohQS+xzQBZK
 WA65zq3N+qWG9g==
 =vA/e
 -----END PGP SIGNATURE-----

Merge tag 'xtensa-20230327' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa fixes from Max Filippov:

 - fix KASAN report in show_stack

 - drop linux-xtensa mailing list from the MAINTAINERS file

* tag 'xtensa-20230327' of https://github.com/jcmvbkbc/linux-xtensa:
  MAINTAINERS: xtensa: drop linux-xtensa@linux-xtensa.org mailing list
  xtensa: fix KASAN report for show_stack
This commit is contained in:
Linus Torvalds 2023-03-29 10:24:07 -07:00
parent 3577a4d37f e313de5b5b
commit ffe78bbd51
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -20645,7 +20645,6 @@ F: sound/soc/codecs/tscs*.h
TENSILICA XTENSA PORT (xtensa)
M: Chris Zankel <chris@zankel.net>
M: Max Filippov <jcmvbkbc@gmail.com>
L: linux-xtensa@linux-xtensa.org
S: Maintained
T: git https://github.com/jcmvbkbc/linux-xtensa.git
F: arch/xtensa/
@ -23038,7 +23037,6 @@ F: drivers/gpio/gpio-xra1403.c
XTENSA XTFPGA PLATFORM SUPPORT
M: Max Filippov <jcmvbkbc@gmail.com>
L: linux-xtensa@linux-xtensa.org
S: Maintained
F: drivers/spi/spi-xtensa-xtfpga.c
F: sound/soc/xtensa/xtfpga-i2s.c

16
arch/xtensa/kernel/traps.c
View File

@ -539,7 +539,7 @@ static size_t kstack_depth_to_print = CONFIG_PRINT_STACK_DEPTH;
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
size_t len;
size_t len, off = 0;
if (!sp)
sp = stack_pointer(task);
@ -548,9 +548,17 @@ void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
kstack_depth_to_print * STACK_DUMP_ENTRY_SIZE);
printk("%sStack:\n", loglvl);
print_hex_dump(loglvl, " ", DUMP_PREFIX_NONE,
STACK_DUMP_LINE_SIZE, STACK_DUMP_ENTRY_SIZE,
sp, len, false);
while (off < len) {
u8 line[STACK_DUMP_LINE_SIZE];
size_t line_len = len - off > STACK_DUMP_LINE_SIZE ?
STACK_DUMP_LINE_SIZE : len - off;
__memcpy(line, (u8 *)sp + off, line_len);
print_hex_dump(loglvl, " ", DUMP_PREFIX_NONE,
STACK_DUMP_LINE_SIZE, STACK_DUMP_ENTRY_SIZE,
line, line_len, false);
off += STACK_DUMP_LINE_SIZE;
}
show_trace(task, sp, loglvl);
}