Merge branch 'akpm' (incoming from Andrew)

Merge second patch-bomb from Andrew Morton: - various misc bits - the rest of MM - add generic fixmap.h, use it - backlight updates - dynamic_debug updates - printk() updates - checkpatch updates - binfmt_elf - ramfs - init/ - autofs4 - drivers/rtc - nilfs - hfsplus - Documentation/ - coredump - procfs - fork - exec - kexec - kdump - partitions - rapidio - rbtree - userns - memstick - w1 - decompressors * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (197 commits) lib/decompress_unlz4.c: always set an error return code on failures romfs: fix returm err while getting inode in fill_super drivers/w1/masters/w1-gpio.c: add strong pullup emulation drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug userns: relax the posix_acl_valid() checks arch/sh/kernel/dwarf.c: use rbtree postorder iteration helper instead of solution using repeated rb_erase() fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix fs/ext3: use rbtree postorder iteration helper instead of opencoding fs/jffs2: use rbtree postorder iteration helper instead of opencoding fs/ext4: use rbtree postorder iteration helper instead of opencoding fs/ubifs: use rbtree postorder iteration helper instead of opencoding net/netfilter/ipset/ip_set_hash_netiface.c: use rbtree postorder iteration instead of opencoding rbtree/test: test rbtree_postorder_for_each_entry_safe() rbtree/test: move rb_node to the middle of the test struct rapidio: add modular rapidio core build into powerpc and mips branches partitions/efi: complete documentation of gpt kernel param purpose kdump: add /sys/kernel/vmcoreinfo ABI documentation kdump: fix exported size of vmcoreinfo note kexec: add sysctl to disable kexec_load fs/exec.c: call arch_pick_mmap_layout() only once ...

Linus Torvalds committed 12 years ago

Commit 3aacd622 parents 7e21774 2a1d689231 files · +3339 −2187Browse files

Showing the changes to kernel (8 of 231 files). Show all

Unified · Split

8 files

kernel/fork.c +3 −7
kernel/kexec.c +2 −1
kernel/ksysfs.c +1 −1
kernel/printk/printk.c +6 −3
kernel/sched/core.c +23 −1
kernel/signal.c +3 −4
kernel/sys.c +3 −5
kernel/sysctl.c +22 −0

kernel/fork.c+3−7

  * Allocate a new mm structure and copy contents from the
  * mm structure of the passed in task structure.
  */
-struct mm_struct *dup_mm(struct task_struct *tsk)
+static struct mm_struct *dup_mm(struct task_struct *tsk)
 {
 	struct mm_struct *mm, *oldmm = current->mm;
 	int err;
-	if (!oldmm)
-		return NULL;
 	mm = allocate_mm();
 	if (!mm)
 		goto fail_nomem;
 	if (!try_module_get(task_thread_info(p)->exec_domain->module))
 		goto bad_fork_cleanup_count;
-	p->did_exec = 0;
 	delayacct_tsk_init(p);	/* Must remain after dup_task_struct() */
 	copy_flags(clone_flags, p);
 	INIT_LIST_HEAD(&p->children);
 	return do_fork(SIGCHLD, 0, 0, NULL, NULL);
 #else
 	/* can not support in nommu mode */
-	return(-EINVAL);
+	return -EINVAL;
 #endif
 }
 #endif
 #ifdef __ARCH_WANT_SYS_VFORK
 SYSCALL_DEFINE0(vfork)
 {
 	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0,
 			0, NULL, NULL);
 }
 #endif

kernel/kexec.c+2−1

  */
 struct kimage *kexec_image;
 struct kimage *kexec_crash_image;
+int kexec_load_disabled;
 static DEFINE_MUTEX(kexec_mutex);
 	int result;
 	/* We only trust the superuser with rebooting the system. */
-	if (!capable(CAP_SYS_BOOT))
+	if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
 		return -EPERM;
 	/*

kernel/ksysfs.c+1−1

@@ -126,7 +126,7 @@ static ssize_t vmcoreinfo_show(struct kobject *kobj, · 125 unmodified lines
126	{	126	{
127	return sprintf(buf, "%lx %x\n",	127	return sprintf(buf, "%lx %x\n",
128	paddr_vmcoreinfo_note(),	128	paddr_vmcoreinfo_note(),
129	(unsigned int)vmcoreinfo_max_size);	129	(unsigned int)sizeof(vmcoreinfo_note));
130	}	130	}
131	KERNEL_ATTR_RO(vmcoreinfo);	131	KERNEL_ATTR_RO(vmcoreinfo);
132		132

kernel/printk/printk.c+6−3

 		 * either merge it with the current buffer and flush, or if
 		 * there was a race with interrupts (prefix == true) then just
 		 * flush it out and store this line separately.
+		 * If the preceding printk was from a different task and missed
+		 * a newline, flush and append the newline.
 		 */
-		if (cont.len && cont.owner == current) {
+		if (cont.len) {
-			if (!(lflags & LOG_PREFIX))
+			if (cont.owner == current && !(lflags & LOG_PREFIX))
-				stored = cont_add(facility, level, text, text_len);
+				stored = cont_add(facility, level, text,
+						  text_len);
 			cont_flush(LOG_NEWLINE);
 		}

kernel/sched/core.c+23−1

@@ -1770,7 +1770,29 @@ void set_numabalancing_state(bool enabled) · 1769 unmodified lines
1770	numabalancing_enabled = enabled;	1770	numabalancing_enabled = enabled;
1771	}	1771	}
1772	#endif /* CONFIG_SCHED_DEBUG */	1772	#endif /* CONFIG_SCHED_DEBUG */
1773	#endif /* CONFIG_NUMA_BALANCING */	1773
		1774	#ifdef CONFIG_PROC_SYSCTL
		1775	int sysctl_numa_balancing(struct ctl_table *table, int write,
		1776	void __user buffer, size_t lenp, loff_t *ppos)
		1777	{
		1778	struct ctl_table t;
		1779	int err;
		1780	int state = numabalancing_enabled;
		1781
		1782	if (write && !capable(CAP_SYS_ADMIN))
		1783	return -EPERM;
		1784
		1785	t = *table;
		1786	t.data = &state;
		1787	err = proc_dointvec_minmax(&t, write, buffer, lenp, ppos);
		1788	if (err < 0)
		1789	return err;
		1790	if (write)
		1791	set_numabalancing_state(state);
		1792	return err;
		1793	}
		1794	#endif
		1795	#endif
1774		1796
1775	/*	1797	/*
1776	* fork()/clone()-time setup:	1798	* fork()/clone()-time setup:

kernel/signal.c+3−4

 		if (task_set_jobctl_pending(current, signr | gstop))
 			sig->group_stop_count++;
-		for (t = next_thread(current); t != current;
+		t = current;
-		     t = next_thread(t)) {
+		while_each_thread(current, t) {
 			/*
 			 * Setting state to TASK_STOPPED for a group
 			 * stop is always done with the siglock held,
 			rm_from_queue_full(&mask, &t->signal->shared_pending);
 			do {
 				rm_from_queue_full(&mask, &t->pending);
-				t = next_thread(t);
+			} while_each_thread(current, t);
-			} while (t != current);
 		}
 	}

kernel/sys.c+3−5

  * only important on a multi-user system anyway, to make sure one user
  * can't send a signal to a process owned by another.  -TYT, 12/12/91
  *
- * Auch. Had to add the 'did_exec' flag to conform completely to POSIX.
+ * !PF_FORKNOEXEC check to conform completely to POSIX.
- * LBT 04.03.94
  */
 SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid)
 {
 		if (task_session(p) != task_session(group_leader))
 			goto out;
 		err = -EACCES;
-		if (p->did_exec)
+		if (!(p->flags & PF_FORKNOEXEC))
 			goto out;
 	} else {
 		err = -ESRCH;
 			t = p;
 			do {
 				accumulate_thread_rusage(t, r);
-				t = next_thread(t);
+			} while_each_thread(p, t);
-			} while (t != p);
 			break;
 		default:

kernel/sysctl.c+22−0

@@ -62,6 +62,7 @@ · 61 unmodified lines
62	#include <linux/capability.h>	62	#include <linux/capability.h>
63	#include <linux/binfmts.h>	63	#include <linux/binfmts.h>
64	#include <linux/sched/sysctl.h>	64	#include <linux/sched/sysctl.h>
		65	#include <linux/kexec.h>
65		66
66	#include <asm/uaccess.h>	67	#include <asm/uaccess.h>
67	#include <asm/processor.h>	68	#include <asm/processor.h>
@@ -389,6 +390,15 @@ static struct ctl_table kern_table[] = { · 321 unmodified lines
389	.mode = 0644,	390	.mode = 0644,
390	.proc_handler = proc_dointvec,	391	.proc_handler = proc_dointvec,
391	},	392	},
		393	{
		394	.procname = "numa_balancing",
		395	.data = NULL, /* filled in by handler */
		396	.maxlen = sizeof(unsigned int),
		397	.mode = 0644,
		398	.proc_handler = sysctl_numa_balancing,
		399	.extra1 = &zero,
		400	.extra2 = &one,
		401	},
392	#endif /* CONFIG_NUMA_BALANCING */	402	#endif /* CONFIG_NUMA_BALANCING */
393	#endif /* CONFIG_SCHED_DEBUG */	403	#endif /* CONFIG_SCHED_DEBUG */
394	{	404	{
@@ -605,6 +615,18 @@ static struct ctl_table kern_table[] = { · 210 unmodified lines
605	.proc_handler = proc_dointvec,	615	.proc_handler = proc_dointvec,
606	},	616	},
607	#endif	617	#endif
		618	#ifdef CONFIG_KEXEC
		619	{
		620	.procname = "kexec_load_disabled",
		621	.data = &kexec_load_disabled,
		622	.maxlen = sizeof(int),
		623	.mode = 0644,
		624	/* only handle a transition from default "0" to "1" */
		625	.proc_handler = proc_dointvec_minmax,
		626	.extra1 = &one,
		627	.extra2 = &one,
		628	},
		629	#endif
608	#ifdef CONFIG_MODULES	630	#ifdef CONFIG_MODULES
609	{	631	{
610	.procname = "modprobe",	632	.procname = "modprobe",