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

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
parents 3577a4d3 e313de5b

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -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

























arch/xtensa/kernel/traps.c



+12
−4






























Original line number
Diff line number
Diff line







@@ -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);









	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,









		       sp, len, false);









			       line, line_len, false);









		off += STACK_DUMP_LINE_SIZE;









	}









	show_trace(task, sp, loglvl);









}