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

Merge tag 'mm-hotfixes-stable-2023-05-03-16-27' of... 

Merge tag 'mm-hotfixes-stable-2023-05-03-16-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull hitfixes from Andrew Morton:
 "Five hotfixes.  Three are cc:stable, two for this -rc cycle"

* tag 'mm-hotfixes-stable-2023-05-03-16-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: change per-VMA lock statistics to be disabled by default
  MAINTAINERS: update Michal Simek's email
  mm/mempolicy: correctly update prev when policy is equal on mbind
  relayfs: fix out-of-bounds access in relay_file_read
  kasan: hw_tags: avoid invalid virt_to_page()
parents 15fb96a3 6152e53d

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com> 
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>

Michel Dänzer <michel@tungstengraphics.com>

Michel Lespinasse <michel@lespinasse.org>

Michel Lespinasse <michel@lespinasse.org> <walken@google.com>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3039,7 +3039,7 @@ F: drivers/video/fbdev/wm8505fb* 
F:	drivers/video/fbdev/wmt_ge_rops.*









ARM/ZYNQ ARCHITECTURE









M:	Michal Simek <michal.simek@xilinx.com>









M:	Michal Simek <michal.simek@amd.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









W:	http://wiki.xilinx.com








@@ -23129,7 +23129,7 @@ F:	drivers/net/can/xilinx_can.c







XILINX GPIO DRIVER









M:	Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>









R:	Srinivas Neeli <srinivas.neeli@xilinx.com>









R:	Michal Simek <michal.simek@xilinx.com>









R:	Michal Simek <michal.simek@amd.com>









S:	Maintained









F:	Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml









F:	Documentation/devicetree/bindings/gpio/gpio-zynq.yaml

























kernel/relay.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -989,7 +989,8 @@ static size_t relay_file_read_start_pos(struct rchan_buf *buf)







	size_t subbuf_size = buf->chan->subbuf_size;









	size_t n_subbufs = buf->chan->n_subbufs;









	size_t consumed = buf->subbufs_consumed % n_subbufs;









	size_t read_pos = consumed * subbuf_size + buf->bytes_consumed;









	size_t read_pos = (consumed * subbuf_size + buf->bytes_consumed)









			% (n_subbufs * subbuf_size);



















	read_subbuf = read_pos / subbuf_size;









	padding = buf->padding[read_subbuf];
































mm/Kconfig.debug



+8
−2






























Original line number
Diff line number
Diff line







@@ -274,6 +274,12 @@ config DEBUG_KMEMLEAK_AUTO_SCAN







config PER_VMA_LOCK_STATS









	bool "Statistics for per-vma locks"









	depends on PER_VMA_LOCK









	default y









	help









	  Statistics for per-vma locks.








	  Say Y here to enable success, retry and failure counters of page









	  faults handled under protection of per-vma locks. When enabled, the









	  counters are exposed in /proc/vmstat. This information is useful for









	  kernel developers to evaluate effectiveness of per-vma locks and to









	  identify pathological cases. Counting these events introduces a small









	  overhead in the page fault path.



















	  If in doubt, say N.
























mm/kasan/hw_tags.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -285,7 +285,7 @@ static void init_vmalloc_pages(const void *start, unsigned long size)







	const void *addr;



















	for (addr = start; addr < start + size; addr += PAGE_SIZE) {









		struct page *page = virt_to_page(addr);









		struct page *page = vmalloc_to_page(addr);



















		clear_highpage_kasan_tagged(page);









	}








@@ -297,7 +297,7 @@ void *__kasan_unpoison_vmalloc(const void *start, unsigned long size,







	u8 tag;









	unsigned long redzone_start, redzone_size;



















	if (!kasan_vmalloc_enabled() || !is_vmalloc_or_module_addr(start)) {









	if (!kasan_vmalloc_enabled()) {









		if (flags & KASAN_VMALLOC_INIT)









			init_vmalloc_pages(start, size);









		return (void *)start;