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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 5307DC282C4 for ; Wed, 13 Feb 2019 02:50:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1689C21934 for ; Wed, 13 Feb 2019 02:50:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550026245; bh=ofvlb1FAZM2rOqevILU11erW4oPCu5AOGtdpqTQ9ZVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kksWnBMe+CFCpxb+LT/Y5HrtnwAF5SsOduTPnAm2kCQj8rQbfY1LoPREI6PRImLXd zYJiGtbKNsRsi8dA2ghqX10L4+YwsDqmGAT3hLgOJ0Lcd6raW8jeqOqAjH2gkX9lBi kwWDLw6iECKwsiRVIMgoB5kqn5HnrF08Udia7TSY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388992AbfBMCun (ORCPT ); Tue, 12 Feb 2019 21:50:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:43110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388755AbfBMCjb (ORCPT ); Tue, 12 Feb 2019 21:39:31 -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 0732B222CC; Wed, 13 Feb 2019 02:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025570; bh=ofvlb1FAZM2rOqevILU11erW4oPCu5AOGtdpqTQ9ZVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y6a3OdrAXpEnCqH9b7ogrh55fKOqWfCR9tbt/YXkZ/3l6FOa5oiOfapG9BVmuuNDS Ckbn0o1L4axqO0aRgY2uz8FSEjDRBWQpjlN4rI8H5qCIphd4PgIMh9EsXgKVbsYVhz hrcDXXbYw+v4eiwvjIOVDthNRn4Xm+YY2/3cwz5s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Oskolkov , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 76/83] bpf: bpf_setsockopt: reset sock dst on SO_MARK changes Date: Tue, 12 Feb 2019 21:36:54 -0500 Message-Id: <20190213023701.20286-76-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023701.20286-1-sashal@kernel.org> References: <20190213023701.20286-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: Peter Oskolkov [ Upstream commit f4924f24da8c7ef64195096817f3cde324091d97 ] In sock_setsockopt() (net/core/sock.h), when SO_MARK option is used to change sk_mark, sk_dst_reset(sk) is called. The same should be done in bpf_setsockopt(). Fixes: 8c4b4c7e9ff0 ("bpf: Add setsockopt helper function to bpf") Reported-by: Maciej Żenczykowski Signed-off-by: Peter Oskolkov Acked-by: Martin KaFai Lau Reviewed-by: Maciej Żenczykowski Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- net/core/filter.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 3400c7abda13..fb0080e84bd4 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3930,7 +3930,10 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, sk->sk_rcvlowat = val ? : 1; break; case SO_MARK: - sk->sk_mark = val; + if (sk->sk_mark != val) { + sk->sk_mark = val; + sk_dst_reset(sk); + } break; default: ret = -EINVAL; -- 2.19.1