Commit 7c903253 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "23 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (23 commits)
  mm, memory_hotplug: fix off-by-one in is_pageblock_removable
  mm: don't let userspace spam allocations warnings
  slub: fix a crash with SLUB_DEBUG + KASAN_SW_TAGS
  kasan, slab: remove redundant kasan_slab_alloc hooks
  kasan, slab: make freelist stored without tags
  kasan, slab: fix conflicts with CONFIG_HARDENED_USERCOPY
  kasan: prevent tracing of tags.c
  kasan: fix random seed generation for tag-based mode
  tmpfs: fix link accounting when a tmpfile is linked in
  psi: avoid divide-by-zero crash inside virtual machines
  mm: handle lru_add_drain_all for UP properly
  mm, page_alloc: fix a division by zero error when boosting watermarks v2
  mm/debug.c: fix __dump_page() for poisoned pages
  proc, oom: do not report alien mms when setting oom_score_adj
  slub: fix SLAB_CONSISTENCY_CHECKS + KASAN_SW_TAGS
  kasan, slub: fix more conflicts with CONFIG_SLAB_FREELIST_HARDENED
  kasan, slub: fix conflicts with CONFIG_SLAB_FREELIST_HARDENED
  kasan, slub: move kasan_poison_slab hook before page_address
  kmemleak: account for tagged pointers when calculating pointer range
  kasan, kmemleak: pass tagged pointers to kmemleak
  ...
parents f6163d67 891cb2a7

arch/arm64/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -339,6 +339,9 @@ void __init setup_arch(char **cmdline_p) 
	smp_init_cpus();

	smp_build_mpidr_hash();



	/* Init percpu seeds for random tags after cpus are set up. */

	kasan_init_tags();



#ifdef CONFIG_ARM64_SW_TTBR0_PAN

	/*

	 * Make sure init_thread_info.ttbr0 always generates translation

arch/arm64/mm/kasan_init.c

+0 −2
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ void __init kasan_init(void) 
	memset(kasan_early_shadow_page, KASAN_SHADOW_INIT, PAGE_SIZE);

	cpu_replace_ttbr1(lm_alias(swapper_pg_dir));



	kasan_init_tags();



	/* At this point kasan is fully initialized. Enable error messages */

	init_task.kasan_depth = 0;

	pr_info("KernelAddressSanitizer initialized\n");

fs/proc/base.c

+0 −4
Original line number Diff line number Diff line
@@ -1086,10 +1086,6 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) 


			task_lock(p);

			if (!p->vfork_done && process_shares_mm(p, mm)) {

				pr_info("updating oom_score_adj for %d (%s) from %d to %d because it shares mm with %d (%s). Report if this is unexpected.\n",

						task_pid_nr(p), p->comm,

						p->signal->oom_score_adj, oom_adj,

						task_pid_nr(task), task->comm);

				p->signal->oom_score_adj = oom_adj;

				if (!legacy && has_capability_noaudit(current, CAP_SYS_RESOURCE))

					p->signal->oom_score_adj_min = (short)oom_adj;

init/initramfs.c

+3 −3
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ skip: 
	initrd_end = 0;

}



#ifdef CONFIG_BLK_DEV_RAM

#define BUF_SIZE 1024

static void __init clean_rootfs(void)

{
@@ -596,6 +597,7 @@ static void __init clean_rootfs(void) 
	ksys_close(fd);

	kfree(buf);

}

#endif



static int __init populate_rootfs(void)

{
@@ -638,10 +640,8 @@ static int __init populate_rootfs(void) 
		printk(KERN_INFO "Unpacking initramfs...\n");

		err = unpack_to_rootfs((char *)initrd_start,

			initrd_end - initrd_start);

		if (err) {

		if (err)

			printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);

			clean_rootfs();

		}

		free_initrd();

#endif

	}

kernel/sched/psi.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static bool update_stats(struct psi_group *group) 
	expires = group->next_update;

	if (now < expires)

		goto out;

	if (now - expires > psi_period)

	if (now - expires >= psi_period)

		missed_periods = div_u64(now - expires, psi_period);



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE