diff options
| author | willy tarreau <w@1wt.eu> | 2016-01-10 07:54:56 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-27 14:28:49 +0000 |
| commit | a5a6cf8c405e826ff7ed1308dde72560c0ed4854 (patch) | |
| tree | acdd069ef9cf2c8252afa4de029c4aa687fbb56c /include/linux | |
| parent | 78a6b3f7be7ae07c7e60f638c77c87701a703559 (diff) | |
| download | lwn-a5a6cf8c405e826ff7ed1308dde72560c0ed4854.tar.gz lwn-a5a6cf8c405e826ff7ed1308dde72560c0ed4854.zip | |
unix: properly account for FDs passed over unix sockets
commit 712f4aad406bb1ed67f3f98d04c044191f0ff593 upstream.
It is possible for a process to allocate and accumulate far more FDs than
the process' limit by sending them over a unix socket then closing them
to keep the process' fd count low.
This change addresses this problem by keeping track of the number of FDs
in flight per user and preventing non-privileged processes from having
more FDs in flight than their configured FD limit.
Reported-by: socketpair@gmail.com
Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Mitigates: CVE-2013-4312 (Linux 2.0+)
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
[carnil: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9b9ac291f66e..2bffa8af59df 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -709,6 +709,7 @@ struct user_struct { unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */ #endif unsigned long locked_shm; /* How many pages of mlocked shm ? */ + unsigned long unix_inflight; /* How many files in flight in unix sockets */ #ifdef CONFIG_KEYS struct key *uid_keyring; /* UID specific keyring */ |