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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 9C59DC432C0 for ; Wed, 27 Nov 2019 20:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73190218AE for ; Wed, 27 Nov 2019 20:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887939; bh=5dEbdlruILwkWbOUiIwYdpi3k5zAZe2wyIRORJgY8cw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JK181hYGJVFaFZWR4Ptc+qt60MXX1wSP8EV7hb3CazIa/QHTWCxQtqNZ35Nf1XEpL /jLbj8+KGIpwD6qx1jUlviG1tqIIumoAx3pHXT7V/gVaKIYHwfzCkthGf38CKB+Mt+ oUiaSuWRCD9ySTw6tBa+SGKnZ4Cn1Fypsfvm69fk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729591AbfK0UwR (ORCPT ); Wed, 27 Nov 2019 15:52:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:39620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730588AbfK0UwP (ORCPT ); Wed, 27 Nov 2019 15:52:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 028BB218AF; Wed, 27 Nov 2019 20:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887934; bh=5dEbdlruILwkWbOUiIwYdpi3k5zAZe2wyIRORJgY8cw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z5Z/o2gpHN1l3ZhrDP9Rg1wm27h9627Pa+RaLA8UkyuHuD4rzlGQrduq3LQ5RwUlG 1edFvMycDevhAVigXP9XcCeYVDqI8ob2Fp3ac2r5lLyd5eIUQbQwstNk/CVQEeqQ2H xl4oVoaISdiMD0iDfzNZjhqvgwlQ3ETUKkPZKx6M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Barmann , Eric Dumazet , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 152/211] sock: Reset dst when changing sk_mark via setsockopt Date: Wed, 27 Nov 2019 21:31:25 +0100 Message-Id: <20191127203108.385631857@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203049.431810767@linuxfoundation.org> References: <20191127203049.431810767@linuxfoundation.org> User-Agent: quilt/0.66 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 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 7ccbcd853cbce..78c9aa310ce6b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -985,10 +985,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