Commit 325d0eab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "15 patches.

  Subsystems affected by this patch series: mailmap, mm/hotfixes,
  mm/thp, mm/memory-hotplug, misc, kcsan"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kcsan: kconfig: move to menu 'Generic Kernel Debugging Instruments'
  fs/fs-writeback.c: adjust dirtytime_interval_handler definition to match prototype
  stackleak: let stack_erasing_sysctl take a kernel pointer buffer
  ftrace: let ftrace_enable_sysctl take a kernel pointer buffer
  mm/memory_hotplug: drain per-cpu pages again during memory offline
  selftests/vm: fix display of page size in map_hugetlb
  mm/thp: fix __split_huge_pmd_locked() for migration PMD
  kprobes: fix kill kprobe which has been marked as gone
  tmpfs: restore functionality of nr_inodes=0
  mlock: fix unevictable_pgs event counts on THP
  mm: fix check_move_unevictable_pages() on THP
  mm: migration of hugetlbfs page skip memcg
  ksm: reinstate memcg charge on copied pages
  mailmap: add older email addresses for Kees Cook
parents c8d1a46f 2645d432

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>

Kees Cook <keescook@chromium.org> <kees@outflux.net>

Kees Cook <keescook@chromium.org> <kees@ubuntu.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

fs/fs-writeback.c

+1 −1
Original line number Diff line number Diff line
@@ -2184,7 +2184,7 @@ static int __init start_dirtytime_writeback(void) 
__initcall(start_dirtytime_writeback);



int dirtytime_interval_handler(struct ctl_table *table, int write,

			       void __user *buffer, size_t *lenp, loff_t *ppos)

			       void *buffer, size_t *lenp, loff_t *ppos)

{

	int ret;

include/linux/ftrace.h

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ static inline int ftrace_mod_get_kallsym(unsigned int symnum, unsigned long *val 
extern int ftrace_enabled;

extern int

ftrace_enable_sysctl(struct ctl_table *table, int write,

		     void __user *buffer, size_t *lenp,

		     loff_t *ppos);

		     void *buffer, size_t *lenp, loff_t *ppos);



struct ftrace_ops;

include/linux/stackleak.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static inline void stackleak_task_init(struct task_struct *t) 


#ifdef CONFIG_STACKLEAK_RUNTIME_DISABLE

int stack_erasing_sysctl(struct ctl_table *table, int write,

			void __user *buffer, size_t *lenp, loff_t *ppos);

			void *buffer, size_t *lenp, loff_t *ppos);

#endif



#else /* !CONFIG_GCC_PLUGIN_STACKLEAK */

kernel/kprobes.c

+8 −1
Original line number Diff line number Diff line
@@ -2140,6 +2140,9 @@ static void kill_kprobe(struct kprobe *p) 


	lockdep_assert_held(&kprobe_mutex);



	if (WARN_ON_ONCE(kprobe_gone(p)))

		return;



	p->flags |= KPROBE_FLAG_GONE;

	if (kprobe_aggrprobe(p)) {

		/*
@@ -2419,7 +2422,10 @@ static int kprobes_module_callback(struct notifier_block *nb, 
	mutex_lock(&kprobe_mutex);

	for (i = 0; i < KPROBE_TABLE_SIZE; i++) {

		head = &kprobe_table[i];

		hlist_for_each_entry(p, head, hlist)

		hlist_for_each_entry(p, head, hlist) {

			if (kprobe_gone(p))

				continue;



			if (within_module_init((unsigned long)p->addr, mod) ||

			    (checkcore &&

			     within_module_core((unsigned long)p->addr, mod))) {
@@ -2437,6 +2443,7 @@ static int kprobes_module_callback(struct notifier_block *nb, 
				kill_kprobe(p);

			}

		}

	}

	if (val == MODULE_STATE_GOING)

		remove_module_kprobe_blacklist(mod);

	mutex_unlock(&kprobe_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE