summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authoryupeng2018-12-06 03:56:28 +0100
committerGreg Kroah-Hartman2019-01-26 09:32:38 +0100
commit50deccdceb59cef130e039c502d3d1419e81417e (patch)
tree8bde7e0fa617f347a7691b23d17d4e5849f0cc78 /net/core
parentstaging: erofs: fix use-after-free of on-stack `z_erofs_vle_unzip_io' (diff)
downloadkernel-qcow2-linux-50deccdceb59cef130e039c502d3d1419e81417e.tar.gz
kernel-qcow2-linux-50deccdceb59cef130e039c502d3d1419e81417e.tar.xz
kernel-qcow2-linux-50deccdceb59cef130e039c502d3d1419e81417e.zip
net: call sk_dst_reset when set SO_DONTROUTE
[ Upstream commit 0fbe82e628c817e292ff588cd5847fc935e025f2 ] after set SO_DONTROUTE to 1, the IP layer should not route packets if the dest IP address is not in link scope. But if the socket has cached the dst_entry, such packets would be routed until the sk_dst_cache expires. So we should clean the sk_dst_cache when a user set SO_DONTROUTE option. Below are server/client python scripts which could reprodue this issue: server side code: ========================================================================== import socket import struct import time s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.bind(('0.0.0.0', 9000)) s.listen(1) sock, addr = s.accept() sock.setsockopt(socket.SOL_SOCKET, socket.SO_DONTROUTE, struct.pack('i', 1)) while True: sock.send(b'foo') time.sleep(1) ========================================================================== client side code: ========================================================================== import socket import time s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect(('server_address', 9000)) while True: data = s.recv(1024) print(data) ========================================================================== Signed-off-by: yupeng <yupeng0921@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 5a8a3b76832f..c9668dcb5eb9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -698,6 +698,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
break;
case SO_DONTROUTE:
sock_valbool_flag(sk, SOCK_LOCALROUTE, valbool);
+ sk_dst_reset(sk);
break;
case SO_BROADCAST:
sock_valbool_flag(sk, SOCK_BROADCAST, valbool);