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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A5501C282C3 for ; Thu, 24 Jan 2019 20:08:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B666218A6 for ; Thu, 24 Jan 2019 20:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548360539; bh=VmYbwt50EZ4Tf2rLp5MAQcEyVoFgj9MxiMiydlScaNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SE4H3aURjcVXtUknICQJ+LyEuAzKLGBlDGWoh6pujCOWLDmEFlxcdSxZJM8OAe7zQ ftxS2lSG+pvjZeTfle3b5nsRq7dqiv/4PIannBp61B3p4NY8LwTF8rv9f4CBeHMSbo rop5zCSJvsc5awsZnaXXCraYna4GmBnTIcPdoY3c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730614AbfAXUI5 (ORCPT ); Thu, 24 Jan 2019 15:08:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:55830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731055AbfAXT2x (ORCPT ); Thu, 24 Jan 2019 14:28:53 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB67B218D4; Thu, 24 Jan 2019 19:28:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358133; bh=VmYbwt50EZ4Tf2rLp5MAQcEyVoFgj9MxiMiydlScaNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kfr6LWdgTokbh0nlifypIHWlYSqMaYeJLoE1suQrpocYf/3ic0J0mKRA0rNPhslvz EV68/NQ50UX37uvpalyW0QTE/F/ayCsL+ohuUg09H6USrpPFon5VfGx4c1NX7KZjcI Ms5GIr6nuf8rxRKZ2+OMwrgkcqKWvFYKifASPJ8A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, yupeng , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 086/104] net: call sk_dst_reset when set SO_DONTROUTE Date: Thu, 24 Jan 2019 20:20:15 +0100 Message-Id: <20190124190204.477016743@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 9fb1c073d0c4..8aa4a5f89572 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -732,6 +732,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