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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 

Pull namespace updates from Eric Biederman:
 "This is a set of small fixes that were mostly stumbled over during
  more significant development. This proc fix and the fix to
  posix-timers are the most significant of the lot.

  There is a lot of good development going on but unfortunately it
  didn't quite make the merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  proc: Fix unbalanced hard link numbers
  signal: Make kill_proc_info static
  rlimit: Properly call security_task_setrlimit
  signal: Remove unused definition of sig_user_definied
  ia64: Remove unused IA64_TASK_SIGHAND_OFFSET and IA64_SIGHAND_SIGLOCK_OFFSET
  ipc: Remove unused declaration of recompute_msgmni
  posix-timers: Correct sanity check in posix_cpu_nsleep
  sysctl: Remove dead register_sysctl_root
parents af82455f d66bb160

arch/ia64/kernel/asm-offsets.c

+0 −4
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ void foo(void) 
	DEFINE(IA64_TASK_PENDING_OFFSET,offsetof (struct task_struct, pending));

	DEFINE(IA64_TASK_PID_OFFSET, offsetof (struct task_struct, pid));

	DEFINE(IA64_TASK_REAL_PARENT_OFFSET, offsetof (struct task_struct, real_parent));

	DEFINE(IA64_TASK_SIGHAND_OFFSET,offsetof (struct task_struct, sighand));

	DEFINE(IA64_TASK_SIGNAL_OFFSET,offsetof (struct task_struct, signal));

	DEFINE(IA64_TASK_TGID_OFFSET, offsetof (struct task_struct, tgid));

	DEFINE(IA64_TASK_THREAD_KSP_OFFSET, offsetof (struct task_struct, thread.ksp));
@@ -64,9 +63,6 @@ void foo(void) 


	BLANK();



	DEFINE(IA64_SIGHAND_SIGLOCK_OFFSET,offsetof (struct sighand_struct, siglock));



	BLANK();



	DEFINE(IA64_SIGNAL_GROUP_STOP_COUNT_OFFSET,offsetof (struct signal_struct,

							     group_stop_count));

fs/proc/generic.c

+1 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ struct proc_dir_entry *proc_create_mount_point(const char *name) 
		ent->data = NULL;

		ent->proc_fops = NULL;

		ent->proc_iops = NULL;

		parent->nlink++;

		if (proc_register(parent, ent) < 0) {

			kfree(ent);

			parent->nlink--;

fs/proc/proc_sysctl.c

+0 −4
Original line number Diff line number Diff line
@@ -408,10 +408,6 @@ static void next_entry(struct ctl_table_header **phead, struct ctl_table **pentr 
	*pentry = entry;

}



void register_sysctl_root(struct ctl_table_root *root)

{

}



/*

 * sysctl_perm does NOT grant the superuser all rights automatically, because

 * some sysctl variables are readonly even to root.

include/linux/sched/signal.h

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ extern int kill_pid_info_as_cred(int, struct siginfo *, struct pid *, 
				const struct cred *, u32);

extern int kill_pgrp(struct pid *pid, int sig, int priv);

extern int kill_pid(struct pid *pid, int sig, int priv);

extern int kill_proc_info(int, struct siginfo *, pid_t);

extern __must_check bool do_notify_parent(struct task_struct *, int);

extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);

extern void force_sig(int, struct task_struct *);

include/linux/signal.h

+0 −4
Original line number Diff line number Diff line
@@ -390,10 +390,6 @@ int unhandled_signal(struct task_struct *tsk, int sig); 
#define sig_kernel_ignore(sig)		siginmask(sig, SIG_KERNEL_IGNORE_MASK)

#define sig_kernel_stop(sig)		siginmask(sig, SIG_KERNEL_STOP_MASK)



#define sig_user_defined(t, signr) \

	(((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_DFL) &&	\

	 ((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_IGN))



#define sig_fatal(t, signr) \

	(!siginmask(signr, SIG_KERNEL_IGNORE_MASK|SIG_KERNEL_STOP_MASK) && \

	 (t)->sighand->action[(signr)-1].sa.sa_handler == SIG_DFL)

CRA Git | Maintained and supported by SUSTech CRA and CCSE