Commit 65aca32e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-03-24-17-09' of... 

Merge tag 'mm-hotfixes-stable-2023-03-24-17-09' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "21 hotfixes, 8 of which are cc:stable. 11 are for MM, the remainder
  are for other subsystems"

* tag 'mm-hotfixes-stable-2023-03-24-17-09' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (21 commits)
  mm: mmap: remove newline at the end of the trace
  mailmap: add entries for Richard Leitner
  kcsan: avoid passing -g for test
  kfence: avoid passing -g for test
  mm: kfence: fix using kfence_metadata without initialization in show_object()
  lib: dhry: fix unstable smp_processor_id(_) usage
  mailmap: add entry for Enric Balletbo i Serra
  mailmap: map Sai Prakash Ranjan's old address to his current one
  mailmap: map Rajendra Nayak's old address to his current one
  Revert "kasan: drop skip_kasan_poison variable in free_pages_prepare"
  mailmap: add entry for Tobias Klauser
  kasan, powerpc: don't rename memintrinsics if compiler adds prefixes
  mm/ksm: fix race with VMA iteration and mm_struct teardown
  kselftest: vm: fix unused variable warning
  mm: fix error handling for map_deny_write_exec
  mm: deduplicate error handling for map_deny_write_exec
  checksyscalls: ignore fstat to silence build warning on LoongArch
  nilfs2: fix kernel-infoleak in nilfs_ioctl_wrap_copy()
  test_maple_tree: add more testing for mas_empty_area()
  maple_tree: fix mas_skip_node() end slot detection
  ...
parents 90c8ce31 d0072ca5

.mailmap

+11 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com> 
Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -379,6 +381,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com> 
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -387,6 +390,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>

Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -397,6 +403,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com> 
Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -437,6 +444,10 @@ Thomas Graf <tgraf@suug.ch> 
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>

Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

arch/powerpc/include/asm/kasan.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __ASM_KASAN_H

#define __ASM_KASAN_H



#ifdef CONFIG_KASAN

#if defined(CONFIG_KASAN) && !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX)

#define _GLOBAL_KASAN(fn)	_GLOBAL(__##fn)

#define _GLOBAL_TOC_KASAN(fn)	_GLOBAL_TOC(__##fn)

#define EXPORT_SYMBOL_KASAN(fn)	EXPORT_SYMBOL(__##fn)

arch/powerpc/include/asm/string.h

+11 −4
Original line number Diff line number Diff line
@@ -30,11 +30,17 @@ extern int memcmp(const void *,const void *,__kernel_size_t); 
extern void * memchr(const void *,int,__kernel_size_t);

void memcpy_flushcache(void *dest, const void *src, size_t size);



#ifdef CONFIG_KASAN

/* __mem variants are used by KASAN to implement instrumented meminstrinsics. */

#ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX

#define __memset memset

#define __memcpy memcpy

#define __memmove memmove

#else /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */

void *__memset(void *s, int c, __kernel_size_t count);

void *__memcpy(void *to, const void *from, __kernel_size_t n);

void *__memmove(void *to, const void *from, __kernel_size_t n);



#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)

#ifndef __SANITIZE_ADDRESS__

/*

 * For files that are not instrumented (e.g. mm/slub.c) we

 * should use not instrumented version of mem* functions.
@@ -46,8 +52,9 @@ void *__memmove(void *to, const void *from, __kernel_size_t n); 
#ifndef __NO_FORTIFY

#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */

#endif



#endif

#endif /* !__SANITIZE_ADDRESS__ */

#endif /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */

#endif /* CONFIG_KASAN */



#ifdef CONFIG_PPC64

#ifndef CONFIG_KASAN

arch/powerpc/kernel/prom_init_check.sh

+7 −2
Original line number Diff line number Diff line
@@ -13,8 +13,13 @@ 
# If you really need to reference something from prom_init.o add

# it to the list below:



grep "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} >/dev/null

if [ $? -eq 0 ]

has_renamed_memintrinsics()

{

	grep -q "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} && \

		! grep -q "^CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX=y" ${KCONFIG_CONFIG}

}



if has_renamed_memintrinsics

then

	MEM_FUNCS="__memcpy __memset"

else

fs/nilfs2/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs, 
	if (argv->v_index > ~(__u64)0 - argv->v_nmembs)

		return -EINVAL;



	buf = (void *)__get_free_pages(GFP_NOFS, 0);

	buf = (void *)get_zeroed_page(GFP_NOFS);

	if (unlikely(!buf))

		return -ENOMEM;

	maxmembs = PAGE_SIZE / argv->v_size;