Message ID | 20210729123351.10084-2-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=JG2TmhzN; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gb92F0qYFz9sV8; Thu, 29 Jul 2021 22:34:12 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1m95En-0003um-UE; Thu, 29 Jul 2021 12:34:09 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <tim.gardner@canonical.com>) id 1m95Ei-0003u0-5q for kernel-team@lists.ubuntu.com; Thu, 29 Jul 2021 12:34:04 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id D75133F078 for <kernel-team@lists.ubuntu.com>; Thu, 29 Jul 2021 12:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1627562043; bh=vSf7j7jiGvEzGzavvJAkpkIgC9e5ftyX0cgFpiV6YJE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JG2TmhzNj5x0JI7/ck8qhgnIfIIAueKbwdh9MyUpQY/0eiQHlbUprDRTr8U3qakA9 WpcmC4xf1tkIzrF4NxP4GWVnE/8J+kFdPmluVCvbk90emIfYZi/hV8xFfzxVsxsHWm HCdv/GSpb4DbIQgmQU0NxGxCGurHFVSbgNrugfaE+ROLNYemICyTYkoGRUbD8Tnk/B OXyJOByf/LfsocomyJAgLITkryPuEHACmVpXXXgAPlE7HA6erwbQRigBUezmQnuNYQ rO2WTv+D6ImLyKI9a2zzchPwrarqf76lqgBmqs+Hb5Q5sGcrLkAWgwJPrsZZDQ9Oq8 Ac8LrzMcOOK2g== Received: by mail-pl1-f200.google.com with SMTP id f17-20020a170902ab91b029012c3bac8d81so4864164plr.23 for <kernel-team@lists.ubuntu.com>; Thu, 29 Jul 2021 05:34:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vSf7j7jiGvEzGzavvJAkpkIgC9e5ftyX0cgFpiV6YJE=; b=twi2Sz+Z2zQdw9fUHm+L548/pusV6pT4wcb7KL+F/PFiHBihg9hFgBRGzctREo8nff fqZYBNSxH3CvsE+5E7ZiO4rcVHJPWBlHJIaqfxiuusr9Yrc+C1ha+XWTpszkkusWofX9 uCnMNS6I7WUufUEmlYbR6LjtkGImcZELvSisT6OVnvirMFubeDjxi4g6Ywx/oCsvquhp rvDwyJcQlQbeAkaasQTWB6yFhwZbOOg9YP945AsJIZDxS8Fu/0qwLtCvwqaPzxFXV4xa 9LJbaYBF2UtGEwrQPCtpDeFa6VGMebRN90IIJ0pV2K2xC4SLCEN9lg8x8zOWugkqm9am Rqbw== X-Gm-Message-State: AOAM530MQjBLP8hlLrzDN5wauzmh1HmVMQdWDBL2+NAvAn0U68MhCgT/ 8Disk+576M03DuXtX2rbKtr5SsbsIGRzOFNrBgEWHSWyb51I+Hp7fqXT3ax38KzTRtl2G1OwEp/ tWEKixKcRt4O8eEgH8dUyOGGQoMZulPE/tzETql6CxA== X-Received: by 2002:a17:90b:3602:: with SMTP id ml2mr5049191pjb.171.1627562042240; Thu, 29 Jul 2021 05:34:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7AzSKnG7mM18NTxrMdg7QRm9QNI5dT0vAOa332HYW/zv9VilzEMp6g/RrivaUpbSgnNFbRQ== X-Received: by 2002:a17:90b:3602:: with SMTP id ml2mr5049176pjb.171.1627562042041; Thu, 29 Jul 2021 05:34:02 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id u16sm3908537pgh.53.2021.07.29.05.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 05:34:01 -0700 (PDT) From: Tim Gardner <tim.gardner@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH] dev_forward_skb: do not scrub skb mark within the same name space Date: Thu, 29 Jul 2021 06:33:51 -0600 Message-Id: <20210729123351.10084-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729123351.10084-1-tim.gardner@canonical.com> References: <20210729123351.10084-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
dev_forward_skb: do not scrub skb mark within the same name space
|
expand
|
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 11a52f2fa35de..edd3806fe944f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3750,7 +3750,7 @@ static __always_inline int ____dev_forward_skb(struct net_device *dev, return NET_RX_DROP; } - skb_scrub_packet(skb, true); + skb_scrub_packet(skb, !net_eq(dev_net(dev), dev_net(skb->dev))); skb->priority = 0; return 0; }