]> git.karo-electronics.de Git - karo-tx-linux.git/commit
tcp: Don't change unlocked socket state in tcp_v4_err().
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Nov 2010 21:35:00 +0000 (13:35 -0800)
committerAK <andi@firstfloor.org>
Sun, 6 Feb 2011 19:03:34 +0000 (11:03 -0800)
commit433591a15ed9237eb89ae123334ae8389e0e95a5
tree337c422e527d0054206c508862b3a3626db13dc2
parentbd5560f20742f1156c97838e51dbf655ff99058b
tcp: Don't change unlocked socket state in tcp_v4_err().

[ Upstream commit 8f49c2703b33519aaaccc63f571b465b9d2b3a2d ]

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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
CC: Damian Lukowski <damian@tvk.rwth-aachen.de>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/tcp_ipv4.c