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,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 342D6C432C3 for ; Sat, 16 Nov 2019 16:16:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B74720878 for ; Sat, 16 Nov 2019 16:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920998; bh=Z8WLsowTzZsW31wmmoVRggCv92659igdD967f0ESUVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xKAFNH4Gp01/1CAbPEpOFkjuQIBye1uU/sJLiD+0WSg0R0a8uSvQtp5jMB4bG4GS/ zEfO28fO7Yt3cR72Co4hs6OBWhALRpx0bhGJS/RQG/u9bwJUPo1hCA8HAhAx3mPjs1 DAYetdWmUgqotK3Hm9pgWJrXsarczUfi6bX+YxsM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729572AbfKPPq7 (ORCPT ); Sat, 16 Nov 2019 10:46:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:53618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728955AbfKPPq5 (ORCPT ); Sat, 16 Nov 2019 10:46:57 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (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 038872089D; Sat, 16 Nov 2019 15:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919217; bh=Z8WLsowTzZsW31wmmoVRggCv92659igdD967f0ESUVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWIyHEquPUXFgYDcoVSyE28wOmC8nNbTrqYA0TwYMzYjBylw9Fyh/Ncu+d/Z5gOdC bCHENy52frZTcZzWAL/ccvmcN6+Df33dzZi7GNczsHAwewi3MN6wV+e134q7Oz+PAc ygsXKfzUf4XB2Zb2p56D7pISpJB9DGLpx0z3tjwA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Barmann , Eric Dumazet , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 222/237] sock: Reset dst when changing sk_mark via setsockopt Date: Sat, 16 Nov 2019 10:40:57 -0500 Message-Id: <20191116154113.7417-222-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154113.7417-1-sashal@kernel.org> References: <20191116154113.7417-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Barmann [ Upstream commit 50254256f382c56bde87d970f3d0d02fdb76ec70 ] When setting the SO_MARK socket option, if the mark changes, the dst needs to be reset so that a new route lookup is performed. This fixes the case where an application wants to change routing by setting a new sk_mark. If this is done after some packets have already been sent, the dst is cached and has no effect. Signed-off-by: David Barmann Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index ba4f843cdd1d1..948fd687292a6 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -951,10 +951,12 @@ int sock_setsockopt(struct socket *sock, int level, int optname, clear_bit(SOCK_PASSSEC, &sock->flags); break; case SO_MARK: - if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) + if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) { ret = -EPERM; - else + } else if (val != sk->sk_mark) { sk->sk_mark = val; + sk_dst_reset(sk); + } break; case SO_RXQ_OVFL: -- 2.20.1