| commit | 80260452aed3ebb509e9cf6f77b5a1dd922f60ef | |
| author | Eric Dumazet <eric.dumazet@gmail.com> | |
| Thu, 25 Nov 2010 04:11:39 +0000 (25 04:11 +0000) | ||
| committer | AK <andi@firstfloor.org> | |
| Sun, 6 Feb 2011 19:03:37 +0000 (6 11:03 -0800) | ||
| tree | a8f30d3187b63122ff8c98cfef0aae7cee24b202 | treesnapshot (tar.gz zip) |
| parent | 993788a53aa0c8efd14922e799e0764220fa5a33 | commitdiff |
af_unix: limit recursion level
[ Upstream commit 25888e30319f8896fc656fc68643e6a078263060 ]
Its easy to eat all kernel memory and trigger NMI watchdog, using an
exploit program that queues unix sockets on top of others.
lkml ref : http://lkml.org/lkml/2010/11/25/8
This mechanism is used in applications, one choice we have is to have a
recursion limit.
Other limits might be needed as well (if we queue other types of files),
since the passfd mechanism is currently limited by socket receive queue
sizes only.
Add a recursion_level to unix socket, allowing up to 4 levels.
Each time we send an unix socket through sendfd mechanism, we copy its
recursion level (plus one) to receiver. This recursion level is cleared
when socket receive queue is emptied.
Reported-by: Марк Коренберг <socketpair@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
[ Upstream commit 25888e30319f8896fc656fc68643e6a078263060 ]
Its easy to eat all kernel memory and trigger NMI watchdog, using an
exploit program that queues unix sockets on top of others.
lkml ref : http://lkml.org/lkml/2010/11/25/8
This mechanism is used in applications, one choice we have is to have a
recursion limit.
Other limits might be needed as well (if we queue other types of files),
since the passfd mechanism is currently limited by socket receive queue
sizes only.
Add a recursion_level to unix socket, allowing up to 4 levels.
Each time we send an unix socket through sendfd mechanism, we copy its
recursion level (plus one) to receiver. This recursion level is cleared
when socket receive queue is emptied.
Reported-by: Марк Коренберг <socketpair@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| include/net/af_unix.h | diffblobblamehistory | |
| net/unix/af_unix.c | diffblobblamehistory | |
| net/unix/garbage.c | diffblobblamehistory |