Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "17 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/acpi/scan.c: document why we don't need the device_hotplug_lock
  memremap: move from kernel/ to mm/
  lib/test_meminit.c: use GFP_ATOMIC in RCU critical section
  asm-generic: fix -Wtype-limits compiler warnings
  cgroup: kselftest: relax fs_spec checks
  mm/memory_hotplug.c: remove unneeded return for void function
  mm/migrate.c: initialize pud_entry in migrate_vma()
  coredump: split pipe command whitespace before expanding template
  page flags: prioritize kasan bits over last-cpuid
  ubsan: build ubsan.c more conservatively
  kasan: remove clang version check for KASAN_STACK
  mm: compaction: avoid 100% CPU usage during compaction when a task is killed
  mm: migrate: fix reference check race between __find_get_block() and migration
  mm: vmscan: check if mem cgroup is disabled or not before calling memcg slab shrinker
  ocfs2: remove set but not used variable 'last_hash'
  Revert "kmemleak: allow to coexist with fault injection"
  kernel/signal.c: fix a kernel-doc markup
parents 61672549 7291edca

arch/mips/vdso/vdso.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#if _MIPS_SIM != _MIPS_SIM_ABI64 && defined(CONFIG_64BIT)



/* Building 32-bit VDSO for the 64-bit kernel. Fake a 32-bit Kconfig. */

#define BUILD_VDSO32_64

#undef CONFIG_64BIT

#define CONFIG_32BIT 1

#ifndef __ASSEMBLY__

drivers/acpi/scan.c

+6 −0
Original line number Diff line number Diff line
@@ -2204,6 +2204,12 @@ int __init acpi_scan_init(void) 
	acpi_gpe_apply_masked_gpes();

	acpi_update_all_gpes();



	/*

	 * Although we call __add_memory() that is documented to require the

	 * device_hotplug_lock, it is not necessary here because this is an

	 * early code when userspace or any other code path cannot trigger

	 * hotplug/hotunplug operations.

	 */

	mutex_lock(&acpi_scan_lock);

	/*

	 * Enumerate devices in the ACPI namespace.

fs/coredump.c

+39 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/stat.h>

#include <linux/fcntl.h>

#include <linux/swap.h>

#include <linux/ctype.h>

#include <linux/string.h>

#include <linux/init.h>

#include <linux/pagemap.h>
@@ -187,11 +188,13 @@ static int cn_print_exe_file(struct core_name *cn) 
 * name into corename, which must have space for at least

 * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator.

 */

static int format_corename(struct core_name *cn, struct coredump_params *cprm)

static int format_corename(struct core_name *cn, struct coredump_params *cprm,

			   size_t **argv, int *argc)

{

	const struct cred *cred = current_cred();

	const char *pat_ptr = core_pattern;

	int ispipe = (*pat_ptr == '|');

	bool was_space = false;

	int pid_in_pattern = 0;

	int err = 0;
@@ -201,12 +204,35 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm) 
		return -ENOMEM;

	cn->corename[0] = '\0';



	if (ispipe)

	if (ispipe) {

		int argvs = sizeof(core_pattern) / 2;

		(*argv) = kmalloc_array(argvs, sizeof(**argv), GFP_KERNEL);

		if (!(*argv))

			return -ENOMEM;

		(*argv)[(*argc)++] = 0;

		++pat_ptr;

	}



	/* Repeat as long as we have more pattern to process and more output

	   space */

	while (*pat_ptr) {

		/*

		 * Split on spaces before doing template expansion so that

		 * %e and %E don't get split if they have spaces in them

		 */

		if (ispipe) {

			if (isspace(*pat_ptr)) {

				was_space = true;

				pat_ptr++;

				continue;

			} else if (was_space) {

				was_space = false;

				err = cn_printf(cn, "%c", '\0');

				if (err)

					return err;

				(*argv)[(*argc)++] = cn->used;

			}

		}

		if (*pat_ptr != '%') {

			err = cn_printf(cn, "%c", *pat_ptr++);

		} else {
@@ -546,6 +572,8 @@ void do_coredump(const kernel_siginfo_t *siginfo) 
	struct cred *cred;

	int retval = 0;

	int ispipe;

	size_t *argv = NULL;

	int argc = 0;

	struct files_struct *displaced;

	/* require nonrelative corefile path and be extra careful */

	bool need_suid_safe = false;
@@ -592,9 +620,10 @@ void do_coredump(const kernel_siginfo_t *siginfo) 


	old_cred = override_creds(cred);



	ispipe = format_corename(&cn, &cprm);

	ispipe = format_corename(&cn, &cprm, &argv, &argc);



	if (ispipe) {

		int argi;

		int dump_count;

		char **helper_argv;

		struct subprocess_info *sub_info;
@@ -637,12 +666,16 @@ void do_coredump(const kernel_siginfo_t *siginfo) 
			goto fail_dropcount;

		}



		helper_argv = argv_split(GFP_KERNEL, cn.corename, NULL);

		helper_argv = kmalloc_array(argc + 1, sizeof(*helper_argv),

					    GFP_KERNEL);

		if (!helper_argv) {

			printk(KERN_WARNING "%s failed to allocate memory\n",

			       __func__);

			goto fail_dropcount;

		}

		for (argi = 0; argi < argc; argi++)

			helper_argv[argi] = cn.corename + argv[argi];

		helper_argv[argi] = NULL;



		retval = -ENOMEM;

		sub_info = call_usermodehelper_setup(helper_argv[0],
@@ -652,7 +685,7 @@ void do_coredump(const kernel_siginfo_t *siginfo) 
			retval = call_usermodehelper_exec(sub_info,

							  UMH_WAIT_EXEC);



		argv_free(helper_argv);

		kfree(helper_argv);

		if (retval) {

			printk(KERN_INFO "Core dump to |%s pipe failed\n",

			       cn.corename);
@@ -766,6 +799,7 @@ void do_coredump(const kernel_siginfo_t *siginfo) 
	if (ispipe)

		atomic_dec(&core_dump_count);

fail_unlock:

	kfree(argv);

	kfree(cn.corename);

	coredump_finish(mm, core_dumped);

	revert_creds(old_cred);

fs/ocfs2/xattr.c

+0 −3
Original line number Diff line number Diff line
@@ -3825,7 +3825,6 @@ static int ocfs2_xattr_bucket_find(struct inode *inode, 
	u16 blk_per_bucket = ocfs2_blocks_per_xattr_bucket(inode->i_sb);

	int low_bucket = 0, bucket, high_bucket;

	struct ocfs2_xattr_bucket *search;

	u32 last_hash;

	u64 blkno, lower_blkno = 0;



	search = ocfs2_xattr_bucket_new(inode);
@@ -3869,8 +3868,6 @@ static int ocfs2_xattr_bucket_find(struct inode *inode, 
		if (xh->xh_count)

			xe = &xh->xh_entries[le16_to_cpu(xh->xh_count) - 1];



		last_hash = le32_to_cpu(xe->xe_name_hash);



		/* record lower_blkno which may be the insert place. */

		lower_blkno = blkno;

include/asm-generic/getorder.h

+20 −30
Original line number Diff line number Diff line
@@ -7,24 +7,6 @@ 
#include <linux/compiler.h>

#include <linux/log2.h>



/*

 * Runtime evaluation of get_order()

 */

static inline __attribute_const__

int __get_order(unsigned long size)

{

	int order;



	size--;

	size >>= PAGE_SHIFT;

#if BITS_PER_LONG == 32

	order = fls(size);

#else

	order = fls64(size);

#endif

	return order;

}



/**

 * get_order - Determine the allocation order of a memory size

 * @size: The size for which to get the order
@@ -43,19 +25,27 @@ int __get_order(unsigned long size) 
 * to hold an object of the specified size.

 *

 * The result is undefined if the size is 0.

 *

 * This function may be used to initialise variables with compile time

 * evaluations of constants.

 */

#define get_order(n)						\

(								\

	__builtin_constant_p(n) ? (				\

		((n) == 0UL) ? BITS_PER_LONG - PAGE_SHIFT :	\

		(((n) < (1UL << PAGE_SHIFT)) ? 0 :		\

		 ilog2((n) - 1) - PAGE_SHIFT + 1)		\

	) :							\

	__get_order(n)						\

)

static inline __attribute_const__ int get_order(unsigned long size)

{

	if (__builtin_constant_p(size)) {

		if (!size)

			return BITS_PER_LONG - PAGE_SHIFT;



		if (size < (1UL << PAGE_SHIFT))

			return 0;



		return ilog2((size) - 1) - PAGE_SHIFT + 1;

	}



	size--;

	size >>= PAGE_SHIFT;

#if BITS_PER_LONG == 32

	return fls(size);

#else

	return fls64(size);

#endif

}



#endif	/* __ASSEMBLY__ */