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=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 40F5EC43387 for ; Wed, 16 Jan 2019 16:48:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 068D3205C9 for ; Wed, 16 Jan 2019 16:48:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Rf5eVRaZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394309AbfAPQsB (ORCPT ); Wed, 16 Jan 2019 11:48:01 -0500 Received: from mail-qt1-f201.google.com ([209.85.160.201]:48581 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388265AbfAPQsA (ORCPT ); Wed, 16 Jan 2019 11:48:00 -0500 Received: by mail-qt1-f201.google.com with SMTP id q3so6211267qtq.15 for ; Wed, 16 Jan 2019 08:48:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=KYImrl0/fbRc9jbU/hagkFDQFHXJJv46As3FzwUr+eE=; b=Rf5eVRaZEbXr529TGIrF9pfDPU7msrCfMNDE8OG/qhzB6PnI81VejNIvlRhebiu5au Yg0qfkhgVbtZNTMLgFtJtQTlZD9rCMi5LTW2K9ucjBdKSD6jv1DtlWq75Yp/RIRYgoUP Y/LQZlF6bU8XtPORaT0Zdl7sysZ1U5RSxRxLhSpN2S9PprnSKTCqUm/XG9xnRJ6epiNT 9Vh3yAFQcmbnHEXDKfSUdUcjUbxTJygkzLVdd1s/djKVzDIAggpNi1mA8FpF/FXU8saB N/Wqnga79I/WZOJDixnng1Sb6e6dWMtvPxnlVW8x81ochYKMgJWapnaFVdJXtskXvl0o JqkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=KYImrl0/fbRc9jbU/hagkFDQFHXJJv46As3FzwUr+eE=; b=qrB3uG0HQZTp10SoOyGRpxepB8MMmiKFJ3S2TuicuKgpoPYl7acrCrRAK0lPJjTTOe 2so9mTa0VxP89Q4ZKsjcYTJ1703qatJ/ZZ+dQ/fBJ/C79dlibKfB2ori6lBm32VBFRTo 4AvMzrTV+FTSMwb4CjOAN4olEvkEPVG5YtzweHLBNm8JcMheRCK413DNNiqez9WUxWVs /4zeUzbUMXHYY/Vs3Nps78h9/ObWEtFLndUVlh1NMvsTjsCIYf3FhlizW3ywq8ova5l1 hMPOgeLBlW9khs/8yqHLDAy428Bcz1yC/qTVTNIO9RayRGxK+7XYWOEYYAwhy+xGmSKG KWvw== X-Gm-Message-State: AJcUukfl6drtYsZDHo4BS/+Yag6IfeV8/Sg9Zm3dsY+aYNGaapEJKbHb kH7RraP1sbESD6O3q+h3yj9ezDB2 X-Google-Smtp-Source: ALg8bN6bynmJHWcXwStOdqPwDmQdCc6w1De7xrINruZPBoXD2HcLULg4IUYEo9Hg49zWzW0K/eWEyfe4 X-Received: by 2002:a0c:ae41:: with SMTP id z1mr5595551qvc.11.1547657279954; Wed, 16 Jan 2019 08:47:59 -0800 (PST) Date: Wed, 16 Jan 2019 08:47:54 -0800 Message-Id: <20190116164754.104170-1-posk@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog Subject: [PATCH bpf-next] bpf: bpf_setsockopt: reset sock dst on SO_MARK changes From: Peter Oskolkov To: Alexei Starovoitov , Daniel Borkmann , netdev@vger.kernel.org Cc: Peter Oskolkov , Peter Oskolkov , "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Reported-by: Maciej =C5=BBenczykowski Signed-off-by: Peter Oskolkov --- 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 2b3b436ef545..0c1bc6ccfd7f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4132,7 +4132,10 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern = *, bpf_sock, sk->sk_rcvlowat =3D val ? : 1; break; case SO_MARK: - sk->sk_mark =3D val; + if (sk->sk_mark !=3D val) { + sk->sk_mark =3D val; + sk_dst_reset(sk); + } break; default: ret =3D -EINVAL; --=20