diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-10 22:59:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-10 22:59:56 +0300 |
| commit | 87ad46e601340394cd75c1c79b19ca906f82c543 (patch) | |
| tree | 33fc81013077804e4bdea9465de66144ca1d025b /include | |
| parent | 75bdc9293dfd1c1dea297bbc65b37c7f6dcb2bd6 (diff) | |
| parent | 63f818f46af9f8b3f17b9695501e8d08959feb60 (diff) | |
| download | linux-87ad46e601340394cd75c1c79b19ca906f82c543.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull proc fix from Eric Biederman:
"A brown paper bag slipped through my proc changes, and syzcaller
caught it when the code ended up in your tree.
I have opted to fix it the simplest cleanest way I know how, so there
is no reasonable chance for the bug to repeat"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
proc: Use a dedicated lock in struct pid
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pid.h b/include/linux/pid.h index 01a0d4e28506..cc896f0fc4e3 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -60,6 +60,7 @@ struct pid { refcount_t count; unsigned int level; + spinlock_t lock; /* lists of tasks that use this pid */ struct hlist_head tasks[PIDTYPE_MAX]; struct hlist_head inodes; |