aboutsummaryrefslogtreecommitdiff
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-12 13:35:00 -0800
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-04-17 16:16:02 -0400
commit7be07193f5663cd1a4657062c47c07282fbc3f3b (patch)
tree1381c6065bad1341bc7dbe36bb883acc359970eb /net/unix/af_unix.c
parent0130382485c1330f40a8f5090f1ea70c6baa20e6 (diff)
tcp: Don't change unlocked socket state in tcp_v4_err().
commit 8f49c2703b33519aaaccc63f571b465b9d2b3a2d upstream Alexey Kuznetsov noticed a regression introduced by commit f1ecd5d9e7366609d640ff4040304ea197fbc618 ("Revert Backoff [v3]: Revert RTO on ICMP destination unreachable") The RTO and timer modification code added to tcp_v4_err() doesn't check sock_owned_by_user(), which if true means we don't have exclusive access to the socket and therefore cannot modify it's critical state. Just skip this new code block if sock_owned_by_user() is true and eliminate the now superfluous sock_owned_by_user() code block contained within. Reported-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: David S. Miller <davem@davemloft.net> CC: Damian Lukowski <damian@tvk.rwth-aachen.de> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions