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.0 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 AE981C43381 for ; Mon, 25 Feb 2019 21:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F375217F4 for ; Mon, 25 Feb 2019 21:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129582; bh=BeccpA7DFMaIVVeJms+vs+k5zzdQanol1HOxElUvihY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AXUp/lCXDZqAgAabaCeZ7SEs/WdoK8k94bazwz3UmxMejZL9YV/1KuoCAK7Pvh5Fy CMrUfNzwmrUIXzembYYZpeAc5kgOub4vz86lg+io980jcaSR/nK5yh7iiOA0sjbcBE 0eIuU+qeo1tv/zG9GSMVq+7A3UNciTsQVn+5P3uI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730347AbfBYVTl (ORCPT ); Mon, 25 Feb 2019 16:19:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:52734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729700AbfBYVTh (ORCPT ); Mon, 25 Feb 2019 16:19:37 -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 86C57205C9; Mon, 25 Feb 2019 21:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129577; bh=BeccpA7DFMaIVVeJms+vs+k5zzdQanol1HOxElUvihY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NtTdm6ZmeytG4HrrxhST2G9hy/DH6ZfNDmshljDM1C6z/An1L/I1QIu95jIkoeH33 KY5p8Zu8X3Xvc96Oi1309j440BI1Go8Po9k8D6+FNZp/beec7bUVLlgq+J0Vn+S5cB o/6rKZn9HPi5DNM5/6/eql/Yxd2wUB1i6pUXAb8E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Peter Oskolkov , Martin KaFai Lau , Daniel Borkmann , Sasha Levin Subject: [PATCH 4.14 41/71] bpf: bpf_setsockopt: reset sock dst on SO_MARK changes Date: Mon, 25 Feb 2019 22:11:43 +0100 Message-Id: <20190225195037.670662018@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195034.555044862@linuxfoundation.org> References: <20190225195034.555044862@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 a8a9ff0568b91..41ede90fc28f5 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3102,7 +3102,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