Commit 4a1f2b0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Fixes from Andrew) 

Merge misc fixes from Andrew Morton:
 "Seven fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
  lib/dma-debug.c: fix __hash_bucket_find()
  mm: compaction: correct the nr_strict va isolated check for CMA
  firmware/memmap: avoid type conflicts with the generic memmap_init()
  pidns: remove recursion from free_pid_ns()
  drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
  kernel/sys.c: fix stack memory content leak via UNAME26
  linux/coredump.h needs asm/siginfo.h
parents deb521c4 fe73fbe1

drivers/firmware/memmap.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static ssize_t memmap_attr_show(struct kobject *kobj, 
 * firmware_map_add() or firmware_map_add_early() afterwards, the entries

 * are not added to sysfs.

 */

static int __init memmap_init(void)

static int __init firmware_memmap_init(void)

{

	struct firmware_map_entry *entry;
@@ -246,5 +246,5 @@ static int __init memmap_init(void) 


	return 0;

}

late_initcall(memmap_init);

late_initcall(firmware_memmap_init);

drivers/video/backlight/lm3639_bl.c

+2 −2
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ static ssize_t lm3639_bled_mode_store(struct device *dev, 


out:

	dev_err(pchip->dev, "%s:i2c access fail to register\n", __func__);

	return size;

	return ret;



out_input:

	dev_err(pchip->dev, "%s:input conversion fail\n", __func__);

	return size;

	return ret;



}

include/linux/coredump.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/types.h>

#include <linux/mm.h>

#include <linux/fs.h>

#include <asm/siginfo.h>



/*

 * These are the only things you should do on a core-file: use only these

include/linux/pid_namespace.h

+1 −7
Original line number Diff line number Diff line
@@ -47,15 +47,9 @@ static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns) 
}



extern struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *ns);

extern void free_pid_ns(struct kref *kref);

extern void zap_pid_ns_processes(struct pid_namespace *pid_ns);

extern int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd);



static inline void put_pid_ns(struct pid_namespace *ns)

{

	if (ns != &init_pid_ns)

		kref_put(&ns->kref, free_pid_ns);

}

extern void put_pid_ns(struct pid_namespace *ns);



#else /* !CONFIG_PID_NS */

#include <linux/err.h>

kernel/pid_namespace.c

+14 −7
Original line number Diff line number Diff line
@@ -133,19 +133,26 @@ struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old 
	return create_pid_namespace(old_ns);

}



void free_pid_ns(struct kref *kref)

static void free_pid_ns(struct kref *kref)

{

	struct pid_namespace *ns, *parent;

	struct pid_namespace *ns;



	ns = container_of(kref, struct pid_namespace, kref);



	parent = ns->parent;

	destroy_pid_namespace(ns);

}



	if (parent != NULL)

		put_pid_ns(parent);

void put_pid_ns(struct pid_namespace *ns)

{

	struct pid_namespace *parent;



	while (ns != &init_pid_ns) {

		parent = ns->parent;

		if (!kref_put(&ns->kref, free_pid_ns))

			break;

		ns = parent;

	}

}

EXPORT_SYMBOL_GPL(free_pid_ns);

EXPORT_SYMBOL_GPL(put_pid_ns);



void zap_pid_ns_processes(struct pid_namespace *pid_ns)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE