Skip to content

Commit e579dde

Browse files
torvaldstorvalds
committed
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
2 parents af82455 + d66bb16 commit e579dde

11 files changed

Lines changed: 4 additions & 21 deletions

File tree

‎arch/ia64/kernel/asm-offsets.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,13 @@ void foo(void)
5656
DEFINE(IA64_TASK_PENDING_OFFSET,offsetof (struct task_struct, pending));
5757
DEFINE(IA64_TASK_PID_OFFSET, offsetof (struct task_struct, pid));
5858
DEFINE(IA64_TASK_REAL_PARENT_OFFSET, offsetof (struct task_struct, real_parent));
59-
DEFINE(IA64_TASK_SIGHAND_OFFSET,offsetof (struct task_struct, sighand));
6059
DEFINE(IA64_TASK_SIGNAL_OFFSET,offsetof (struct task_struct, signal));
6160
DEFINE(IA64_TASK_TGID_OFFSET, offsetof (struct task_struct, tgid));
6261
DEFINE(IA64_TASK_THREAD_KSP_OFFSET, offsetof (struct task_struct, thread.ksp));
6362
DEFINE(IA64_TASK_THREAD_ON_USTACK_OFFSET, offsetof (struct task_struct, thread.on_ustack));
6463

6564
BLANK();
6665

67-
DEFINE(IA64_SIGHAND_SIGLOCK_OFFSET,offsetof (struct sighand_struct, siglock));
68-
69-
BLANK();
7066

7167
DEFINE(IA64_SIGNAL_GROUP_STOP_COUNT_OFFSET,offsetof (struct signal_struct,
7268
group_stop_count));

‎fs/proc/generic.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ struct proc_dir_entry *proc_create_mount_point(const char *name)
472472
ent->data = NULL;
473473
ent->proc_fops = NULL;
474474
ent->proc_iops = NULL;
475+
parent->nlink++;
475476
if (proc_register(parent, ent) < 0) {
476477
kfree(ent);
477478
parent->nlink--;

‎fs/proc/proc_sysctl.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,6 @@ static void next_entry(struct ctl_table_header **phead, struct ctl_table **pentr
408408
*pentry = entry;
409409
}
410410

411-
void register_sysctl_root(struct ctl_table_root *root)
412-
{
413-
}
414-
415411
/*
416412
* sysctl_perm does NOT grant the superuser all rights automatically, because
417413
* some sysctl variables are readonly even to root.

‎include/linux/sched/signal.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ extern int kill_pid_info_as_cred(int, struct siginfo *, struct pid *,
293293
const struct cred *, u32);
294294
extern int kill_pgrp(struct pid *pid, int sig, int priv);
295295
extern int kill_pid(struct pid *pid, int sig, int priv);
296-
extern int kill_proc_info(int, struct siginfo *, pid_t);
297296
extern __must_check bool do_notify_parent(struct task_struct *, int);
298297
extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
299298
extern void force_sig(int, struct task_struct *);

‎include/linux/signal.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,10 +390,6 @@ int unhandled_signal(struct task_struct *tsk, int sig);
390390
#define sig_kernel_ignore(sig) siginmask(sig, SIG_KERNEL_IGNORE_MASK)
391391
#define sig_kernel_stop(sig) siginmask(sig, SIG_KERNEL_STOP_MASK)
392392

393-
#define sig_user_defined(t, signr) \
394-
(((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_DFL) && \
395-
((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_IGN))
396-
397393
#define sig_fatal(t, signr) \
398394
(!siginmask(signr, SIG_KERNEL_IGNORE_MASK|SIG_KERNEL_STOP_MASK) && \
399395
(t)->sighand->action[(signr)-1].sa.sa_handler == SIG_DFL)

‎include/linux/sysctl.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ extern void setup_sysctl_set(struct ctl_table_set *p,
180180
int (*is_seen)(struct ctl_table_set *));
181181
extern void retire_sysctl_set(struct ctl_table_set *set);
182182

183-
void register_sysctl_root(struct ctl_table_root *root);
184183
struct ctl_table_header *__register_sysctl_table(
185184
struct ctl_table_set *set,
186185
const char *path, struct ctl_table *table);

‎ipc/util.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ extern struct msg_msg *load_msg(const void __user *src, size_t len);
153153
extern struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst);
154154
extern int store_msg(void __user *dest, struct msg_msg *msg, size_t len);
155155

156-
extern void recompute_msgmni(struct ipc_namespace *);
157-
158156
static inline int ipc_buildid(int id, int seq)
159157
{
160158
return SEQ_MULTIPLIER * seq + id;

‎kernel/signal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
13181318
}
13191319
}
13201320

1321-
int kill_proc_info(int sig, struct siginfo *info, pid_t pid)
1321+
static int kill_proc_info(int sig, struct siginfo *info, pid_t pid)
13221322
{
13231323
int error;
13241324
rcu_read_lock();

‎kernel/sys.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,8 +1396,7 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
13961396
!capable(CAP_SYS_RESOURCE))
13971397
retval = -EPERM;
13981398
if (!retval)
1399-
retval = security_task_setrlimit(tsk->group_leader,
1400-
resource, new_rlim);
1399+
retval = security_task_setrlimit(tsk, resource, new_rlim);
14011400
if (resource == RLIMIT_CPU && new_rlim->rlim_cur == 0) {
14021401
/*
14031402
* The caller is asking for an immediate RLIMIT_CPU

‎kernel/time/posix-cpu-timers.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ static int posix_cpu_nsleep(const clockid_t which_clock, int flags,
13181318
*/
13191319
if (CPUCLOCK_PERTHREAD(which_clock) &&
13201320
(CPUCLOCK_PID(which_clock) == 0 ||
1321-
CPUCLOCK_PID(which_clock) == current->pid))
1321+
CPUCLOCK_PID(which_clock) == task_pid_vnr(current)))
13221322
return -EINVAL;
13231323

13241324
error = do_cpu_nanosleep(which_clock, flags, rqtp, &it);

0 commit comments

Comments
 (0)