Skip to content

Commit c509ce2

Browse files
committed
Merge tag 'for-linus-2021-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux
Pull misc fixes from Christian Brauner: - Jann reported sparse complaints because of a missing __user annotation in a helper we added way back when we added pidfd_send_signal() to avoid compat syscall handling. Fix it. - Yanfei replaces a reference in a comment to the _do_fork() helper I removed a while ago with a reference to the new kernel_clone() replacement - Alexander Guril added a simple coding style fix * tag 'for-linus-2021-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux: kthread: remove comments about old _do_fork() helper Kernel: fork.c: Fix coding style: Do not use {} around single-line statements signal: Add missing __user annotation to copy_siginfo_from_user_any
2 parents 4dcd3bc + cb5021c commit c509ce2

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

include/trace/events/sched.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ TRACE_EVENT(sched_process_wait,
366366
);
367367

368368
/*
369-
* Tracepoint for do_fork:
369+
* Tracepoint for kernel_clone:
370370
*/
371371
TRACE_EVENT(sched_process_fork,
372372

kernel/fork.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -819,9 +819,8 @@ void __init fork_init(void)
819819
init_task.signal->rlim[RLIMIT_SIGPENDING] =
820820
init_task.signal->rlim[RLIMIT_NPROC];
821821

822-
for (i = 0; i < UCOUNT_COUNTS; i++) {
822+
for (i = 0; i < UCOUNT_COUNTS; i++)
823823
init_user_ns.ucount_max[i] = max_threads/2;
824-
}
825824

826825
#ifdef CONFIG_VMAP_STACK
827826
cpuhp_setup_state(CPUHP_BP_PREPARE_DYN, "fork:vm_stack_cache",
@@ -1654,9 +1653,8 @@ static inline void init_task_pid_links(struct task_struct *task)
16541653
{
16551654
enum pid_type type;
16561655

1657-
for (type = PIDTYPE_PID; type < PIDTYPE_MAX; ++type) {
1656+
for (type = PIDTYPE_PID; type < PIDTYPE_MAX; ++type)
16581657
INIT_HLIST_NODE(&task->pid_links[type]);
1659-
}
16601658
}
16611659

16621660
static inline void

kernel/kthread.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static int kthread(void *_create)
294294
do_exit(ret);
295295
}
296296

297-
/* called from do_fork() to get node information for about to be created task */
297+
/* called from kernel_clone() to get node information for about to be created task */
298298
int tsk_fork_get_node(struct task_struct *tsk)
299299
{
300300
#ifdef CONFIG_NUMA

kernel/signal.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3704,7 +3704,8 @@ static bool access_pidfd_pidns(struct pid *pid)
37043704
return true;
37053705
}
37063706

3707-
static int copy_siginfo_from_user_any(kernel_siginfo_t *kinfo, siginfo_t *info)
3707+
static int copy_siginfo_from_user_any(kernel_siginfo_t *kinfo,
3708+
siginfo_t __user *info)
37083709
{
37093710
#ifdef CONFIG_COMPAT
37103711
/*

0 commit comments

Comments
 (0)