From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 535D0C43387 for ; Tue, 8 Jan 2019 19:28:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18E3C20883 for ; Tue, 8 Jan 2019 19:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546975696; bh=MzHoI7j5VQTWlShsqqtxtoqIkeY13Qg78dnGh9UvX9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xRKesbWqrfzYzSJuSTJkOtULUPFRyWLNMOAf44VUgz4rNyBR8GEq0AWEDZhrD2Jcg QSUfniMUZNbssi9L3Rp84tGOMflU1pn2zXgCFo2xkKyzYjE6xHBVD1RjDtH74fOc7L C0Jvr/ZNnUM6OHH8QpztHx2u2HMPk1wNN37Axy7o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729958AbfAHT2P (ORCPT ); Tue, 8 Jan 2019 14:28:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:35052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729324AbfAHT2M (ORCPT ); Tue, 8 Jan 2019 14:28:12 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BF33120645; Tue, 8 Jan 2019 19:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546975691; bh=MzHoI7j5VQTWlShsqqtxtoqIkeY13Qg78dnGh9UvX9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CuYui3UXP10R3ocekrmdcMBMG0cGed7RsaSU5bLsiQsxX2DKvPLqjUvlhH5QMdie4 PZp+PEyVK3fMjbhJ1aYU69m7hHsGqOTrCt5zN8IruBBp31+k9ess36ExSVQN/+nyAf YCyyJvtNJdZY0mULqjuaZbQxQxSg4X2jbwua4edw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: yupeng , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 057/117] net: call sk_dst_reset when set SO_DONTROUTE Date: Tue, 8 Jan 2019 14:25:25 -0500 Message-Id: <20190108192628.121270-57-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190108192628.121270-1-sashal@kernel.org> References: <20190108192628.121270-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: yupeng [ 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/core/sock.c b/net/core/sock.c index 080a880a1761..1d0e5ba366a9 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); -- 2.19.1