From patchwork Wed Jan 10 11:00:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tikhomirov X-Patchwork-Id: 186790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp716738dyi; Wed, 10 Jan 2024 03:06:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcdgjy8FaV6k1fTIYobffWklUuh/OJ3x+FzYs4BsMCWKuz7BbuiUii6rwB3TS8anQASjB1 X-Received: by 2002:ac8:5906:0:b0:429:af00:8be with SMTP id 6-20020ac85906000000b00429af0008bemr1123952qty.82.1704884804928; Wed, 10 Jan 2024 03:06:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704884804; cv=pass; d=google.com; s=arc-20160816; b=hlqodcvbhJEYh9yBF1SxhiY2IktVslp4jU0n6ccvC1LxtZSoC1a4Sweuoi0llMR6Fu erNRt6BfjgxZyZUXUGoj3Lir7S0VzehrhST2WBRDY+CGEnaeX7IpVSpNCVgJBO1BPWib 8pXVI+ddyV7Z84Ehaj4FaAVver8TxGEHtWk2wbf6XF8VIZPmI4x+BKMDsh0AA/m1hEzV ACxva9/+bddXtaKLRLjiRwvgCH0LVATDfJqT5Ftt4GAGplNWOgWDsioTYZ6RH6RA87rZ 3Yq0nnBUm4ZThYTeSW6Sf/QTtD7v/QfVPao7a8/kgbdhghZj1lIfKffuQn40qGJ2X//+ hAjQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Pe3cO7GjcJxW3na/CdSgUBO8HWJMSJUYmkXZwOyIE30=; fh=nHe+dLycVly9d/jJLFPdigL4KB0c7Xu5Yjx8SuZ6h70=; b=eVBEKSlxxnuF5D8H2JX8B26nJ0YG2YlFlPFkg4b9eQDe7HseLXEWimjhYg9+WM2XOk REOq4FPPb9ORuDTZmeR2JUtkMB+VpegNTPmEMA8sdiBpLsVJIqPGBpW+dWrwpH83PPpD XG87pxJy7rdM6+a+HQxmBXp8KIDKy7Q30OKCK3w9YpHT8aJ/LFNoBOtTkqdUvFd7n8We 0EUJDOJEJyMkr+fLQRJAVU9I+tHo+l7DGr1B4U8o1jFWVb4mwT8S12QvGpJXN8pBwNKO gMGZLMz6g5ZIEBnqI8jxYcr9pG5s+CJYh0P8F9AvUg/Bpc+20uJNZk7hbs3B2MbCg1tR rcaQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=rDyCniIK; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of linux-kernel+bounces-22040-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22040-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id z13-20020a05622a060d00b004299892f32asi3937718qta.502.2024.01.10.03.06.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 03:06:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-22040-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=rDyCniIK; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of linux-kernel+bounces-22040-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22040-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A760A1C21E1A for ; Wed, 10 Jan 2024 11:06:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 49EFA4778B; Wed, 10 Jan 2024 11:05:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="rDyCniIK" Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2112.outbound.protection.outlook.com [40.107.104.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 874C447A76; Wed, 10 Jan 2024 11:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Be7pupxgcGNEAi00MdqSVhjCic+e6Lnn6Acc338mCs0pR4/K/DOPLxvTbiWL6TyODP9eTbva2Qzk9Qt1t6yp1OimsyF6ttkTpSfoZDW2GX6fjOHwfw9Yyx71aOB39i541rkZ96KBkCkrGy2wZipbfcrdHSFyCYKKR6FcmI3/1aMx1hJep/t1pkLV3O1fAj+Y0ubadHu37YF43q5pTNbuRCnkVmQXVSXI1N3Fh/L0SrYenDHCCv0jscXQMwP9CsZaCRWbxZGh602cdcLEkVr/y283ukct3f+LYolzdxhZoqJlUtzhf0m5SU1THEKRxqgK27Z9Miv9A4DIcZ+9B6JKkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pe3cO7GjcJxW3na/CdSgUBO8HWJMSJUYmkXZwOyIE30=; b=bQY/bIPmUTUksQpN2YyOk4Rtt4bYoL6K+M8uTTVs+0TIZrGBloHAvRlql8z9NqiU70dWszwUPmUIzhVehTRlVH/EC/eKP4T8UlwV+RREejBXiC7xmJK9SRqkh1L3ICxA08+60LKz5jsAXm7AxMDIhKfie4WB6OsakOaTeYvVegafwn8H5cYeamAFTJpUOew71tcBQaeKdv3e5YiDKFKaxinn0opN3bMs4nSuGkszs6aCdMbMUD2csrfg6HR8973J4EzWLbWdabflRWfu/YWmQdPy+GjNaDI9iqwGgDbxCvOuhMy0yzfoRD5QWPRdJiaIv9lfXSQperdr1cEC+4gCrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pe3cO7GjcJxW3na/CdSgUBO8HWJMSJUYmkXZwOyIE30=; b=rDyCniIKsf0UWsyXFIbPg3Utmf1d93bZhtXP3Y9kf5HBsdl4MtUmoUFNTgthLXCAExQhpeCnPGklToe79aA66H9D2/C1p8Y+MwX1U6HPrT3dh20IWzULOZv5u7lp7IeJ9wphLFYQyroHAq+M7OgRHjt6dEelqTQD0t2sWinO7aeQOc5Y/ybBmTcZvn0sO2eUDJLnBIPM5gdeFxoTOwL+/COzRp+x2QRQgw+mPueGk42wiiQKnwv/ST1yCIeafTQ9BalR8zYrqE0xxY+3WT/pk+LMT+D1QRnis+ar8Eytt3BraTuu0xxPAyYNA9/clFumlaA5mpGl/csKyJZnJ6//HA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from DU0PR08MB9003.eurprd08.prod.outlook.com (2603:10a6:10:471::13) by AS8PR08MB5990.eurprd08.prod.outlook.com (2603:10a6:20b:296::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.23; Wed, 10 Jan 2024 11:05:21 +0000 Received: from DU0PR08MB9003.eurprd08.prod.outlook.com ([fe80::72c4:98fc:4d1b:b9ba]) by DU0PR08MB9003.eurprd08.prod.outlook.com ([fe80::72c4:98fc:4d1b:b9ba%5]) with mapi id 15.20.7181.015; Wed, 10 Jan 2024 11:05:21 +0000 From: Pavel Tikhomirov To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Florian Westphal Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@openvz.org, Pavel Tikhomirov Subject: [PATCH 3/4] netfilter: propagate net to nf_bridge_get_physindev Date: Wed, 10 Jan 2024 19:00:13 +0800 Message-ID: <20240110110451.5473-4-ptikhomirov@virtuozzo.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240110110451.5473-1-ptikhomirov@virtuozzo.com> References: <20240110110451.5473-1-ptikhomirov@virtuozzo.com> X-ClientProxiedBy: KU1PR03CA0041.apcprd03.prod.outlook.com (2603:1096:802:19::29) To DU0PR08MB9003.eurprd08.prod.outlook.com (2603:10a6:10:471::13) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9003:EE_|AS8PR08MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 29ebc161-e4d6-4e7e-1cb0-08dc11cc098c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dJLwRJLDN8ctTpmdIpbRlofhVwbWHE/O0fgHQrJPUT3en0gOgGNuGZkJ4ROaM3cYh8kKwpWXYkuYkAuCDylhx+Gd21RR/eresVGWXu1NRv5bXXVQeIT9XcGfrqjjRHkBICnTuv+6ddnTS/P45yXubKTEvZ1j8v4uMFKr0Z/5C0vUSR+ss7+ztduFToC9gj0OynA36DjsJ5aL5NDJ69z5DzlrP0wP+bKlP14qTstCuzrqL7iM77z8DNHVyosKXt8U/tmVfVGlm84jkJfKH5CikH/tOZX2NZPjL4JjskR/94+Kw6sfyPu8heO4F51yg6mWwvp9ajq559re4bZx/wDrBo0LqoZ2ITfaH4LXw/nIwgmGzstp1lMkRVRDj1nn7cZ/DJTGRRJ6JnVsmv9ZgxdZOYXtTX/V48Y3fo5kowaYFgJIYjaNRyJhRYBjpS8WlEI7MyUsEPEIztnZFEy/Y0d7RPHYYtJvYOeXfRbm17eDGI+wOokIf8J5z0jd3i+br2RFvgndi25FRnLLixkdwwwCa3dJZsK66jw+0kDDAXuDqClG/4prI8WcUYsDCsnBRGSO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9003.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(396003)(376002)(136003)(39850400004)(366004)(346002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(6512007)(1076003)(83380400001)(36756003)(86362001)(38100700002)(5660300002)(4326008)(6666004)(52116002)(6506007)(2616005)(107886003)(8676002)(316002)(110136005)(8936002)(66946007)(66556008)(66476007)(41300700001)(2906002)(6486002)(478600001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C2Thc/jgWhBdAO8rTszOQMOa56aurQOvLLJsEYC+3+L5LkqmTJ1k6ys0vKZDIt243KrM37l4iHVT1ieDkcFwgRoe/lpkD2F4TFfClo2mWEVZpN4bdK6pl4BsefcGxFMLvwjkNWkdXaJsNVjiLUpcfvBQzTD82qoA5P1P2AJ+PGrhF0YVLvzk9iZrevVTgVeZ+1541nGUbY1mw/dS28VS//va0DK7/yKXUmxDI3alCBd1QwH4Fo85tN4EApAIG1lMb2b8sO3kwUJtN+26vSvfIdREyqVeMz4n3ttcYI9tPliFi0EpxxwoxeMaS1PzcqmRjWNjwbDcPUXFqF/S4gldwnRnTV7ZNdhbfIlkBiQpzNP0s6eOekwYqGHSTcyoDty42UuSatJl/GXAAYqTG8ZTRYkSAZU5GeuotOZyMPeJm9OOmv5o4xdRVYi0aLMTAGw0NCLB+41vB4lvbodqD/Hz4dECkKMkBcwY5fyX5LMRp00Av4FahBPE508rXqFKalC2c8mojmGAN8ylBThuLbbi5IMzjA3vdnwSsXAEPMJHmzKtDyBDGqAF52DjyFxcsvLMODyOFARW9XlF40fMbIStGZbf/aZ/ytXwBJhKgn6Vkc8MxRwiAjM0QWn3/MZD+3n8ozsSRTc8U/68GKzhWOmX6tnAEYzvlePUd8XDcbiTd6BosXW+3S+85XRNmCmZd1+3nRh4bK9gnNaq7VOe/9Y4zkDrfg57cb3DRQBPwoLwKBetnfkGSkWQwjoY7fo2xsGZ+git5pC/MPZEZdV8NHdefU5FquaJko50srB0gLp2F8Fq9a96+QTTWzNWMNO6A61jWAlTl3/8sGqLw2AwgD3GuQbcgQ+Qz5Uoi3wIZHtY0FCpnDF8E2iAZLwbngY1Zsyh1VOWvCXcxuDf21U+B8rL/pZtzxgVdtVwUKIMBIg0J+YZQAmin2wtH39xXzVdb7JKebTnz8UZigzfhbQ7EquHHjdCCbIplTh3rgeU0GTr3a9MEsKxUY3OZ/YHWRkri4HtfErMd6m1P1JjqjAhfPdKdoSspdkNTTJeFw8T6PG9DcHzfKtFVGFfJUSPu/G4DtDA8wXKUZ8qeSG5zuHn43udfvYxjJZ824wEDaF+BJhW18w9sO4mOGUw7w9iOFYgfQheY01yE6uLYy8xzdRqEXoRI247brWZsnZLr9zsAj8x1WPL+Kv7z/PhHC0prTwfXBYlbPJ66ekvKbpESM1fl+npqA4a+hV992uWd6T4IHbFEXeVys7M+bCW4Bs+LomiZEpLBEIioj4PldETY/KtbRK7OJgyApniEZ35JXLPo7Xks+PkBQh/mlGUPMYXmAtx2qUdgaP/zvokMRS1zmHNgtRa0hpQI9lxsbFbCoG6A0M0Td8eVLZCF3xB5UT9t/0SnL+ihpVR/K9H+qTjIx4bwe62dZexRSMYGLE2dDp57APKf7QbE3T05tFpn76tMBw/kyxJVJAtpk1/ffvke5/fC0aVgO6eqIru1vCe6hZWZRceKzo1jIX55MR0iChFs1QFEaArxXV8jgIHrAYD3g0/9pbHoqzt98TQm+5DfVxt5BJK3YadB3TLoV6ywQbYTsk4mv9yxarFj9+RLMA/JpNiX9GyEnyHk4WmDuENCui+WsYI6reaq4th9IY/ay82lN+oLswdWQ2EKUt9rRcmOK5mGPZ/Nw== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29ebc161-e4d6-4e7e-1cb0-08dc11cc098c X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9003.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2024 11:05:21.3637 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3ailSpB743b9yviqeuPlki9OHjculBU/G/oA60jFI7ErZlE6nJZq3UvQN1rREYC1RyWkwVTzrz8V756ukOUgQfj2V9nzv1EWfak2n5dgp3M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5990 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787701289309781588 X-GMAIL-MSGID: 1787701289309781588 This is a preparation patch for replacing physindev with physinif on nf_bridge_info structure. We will use dev_get_by_index_rcu to resolve device, when needed, and it requires net. Signed-off-by: Pavel Tikhomirov Acked-by: Florian Westphal --- include/linux/netfilter_bridge.h | 2 +- net/ipv4/netfilter/nf_reject_ipv4.c | 2 +- net/ipv6/netfilter/nf_reject_ipv6.c | 2 +- net/netfilter/ipset/ip_set_hash_netiface.c | 8 ++++---- net/netfilter/nf_log_syslog.c | 13 +++++++------ net/netfilter/nf_queue.c | 2 +- net/netfilter/nfnetlink_log.c | 5 +++-- net/netfilter/xt_physdev.c | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index f980edfdd2783..e927b9a15a556 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -56,7 +56,7 @@ static inline int nf_bridge_get_physoutif(const struct sk_buff *skb) } static inline struct net_device * -nf_bridge_get_physindev(const struct sk_buff *skb) +nf_bridge_get_physindev(const struct sk_buff *skb, struct net *net) { const struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb); diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c index f01b038fc1cda..86e7d390671af 100644 --- a/net/ipv4/netfilter/nf_reject_ipv4.c +++ b/net/ipv4/netfilter/nf_reject_ipv4.c @@ -289,7 +289,7 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb, * build the eth header using the original destination's MAC as the * source, and send the RST packet directly. */ - br_indev = nf_bridge_get_physindev(oldskb); + br_indev = nf_bridge_get_physindev(oldskb, net); if (br_indev) { struct ethhdr *oeth = eth_hdr(oldskb); diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c index d45bc54b7ea55..27b2164f4c439 100644 --- a/net/ipv6/netfilter/nf_reject_ipv6.c +++ b/net/ipv6/netfilter/nf_reject_ipv6.c @@ -354,7 +354,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb, * build the eth header using the original destination's MAC as the * source, and send the RST packet directly. */ - br_indev = nf_bridge_get_physindev(oldskb); + br_indev = nf_bridge_get_physindev(oldskb, net); if (br_indev) { struct ethhdr *oeth = eth_hdr(oldskb); diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c index 95aeb31c60e0d..30a655e5c4fdc 100644 --- a/net/netfilter/ipset/ip_set_hash_netiface.c +++ b/net/netfilter/ipset/ip_set_hash_netiface.c @@ -138,9 +138,9 @@ hash_netiface4_data_next(struct hash_netiface4_elem *next, #include "ip_set_hash_gen.h" #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) -static const char *get_physindev_name(const struct sk_buff *skb) +static const char *get_physindev_name(const struct sk_buff *skb, struct net *net) { - struct net_device *dev = nf_bridge_get_physindev(skb); + struct net_device *dev = nf_bridge_get_physindev(skb, net); return dev ? dev->name : NULL; } @@ -177,7 +177,7 @@ hash_netiface4_kadt(struct ip_set *set, const struct sk_buff *skb, if (opt->cmdflags & IPSET_FLAG_PHYSDEV) { #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) - const char *eiface = SRCDIR ? get_physindev_name(skb) : + const char *eiface = SRCDIR ? get_physindev_name(skb, xt_net(par)) : get_physoutdev_name(skb); if (!eiface) @@ -395,7 +395,7 @@ hash_netiface6_kadt(struct ip_set *set, const struct sk_buff *skb, if (opt->cmdflags & IPSET_FLAG_PHYSDEV) { #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) - const char *eiface = SRCDIR ? get_physindev_name(skb) : + const char *eiface = SRCDIR ? get_physindev_name(skb, xt_net(par)) : get_physoutdev_name(skb); if (!eiface) diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c index c66689ad2b491..58402226045e8 100644 --- a/net/netfilter/nf_log_syslog.c +++ b/net/netfilter/nf_log_syslog.c @@ -111,7 +111,8 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u8 pf, unsigned int hooknum, const struct sk_buff *skb, const struct net_device *in, const struct net_device *out, - const struct nf_loginfo *loginfo, const char *prefix) + const struct nf_loginfo *loginfo, const char *prefix, + struct net *net) { const struct net_device *physoutdev __maybe_unused; const struct net_device *physindev __maybe_unused; @@ -121,7 +122,7 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u8 pf, in ? in->name : "", out ? out->name : ""); #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) - physindev = nf_bridge_get_physindev(skb); + physindev = nf_bridge_get_physindev(skb, net); if (physindev && in != physindev) nf_log_buf_add(m, "PHYSIN=%s ", physindev->name); physoutdev = nf_bridge_get_physoutdev(skb); @@ -148,7 +149,7 @@ static void nf_log_arp_packet(struct net *net, u_int8_t pf, loginfo = &default_loginfo; nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo, - prefix); + prefix, net); dump_arp_packet(m, loginfo, skb, skb_network_offset(skb)); nf_log_buf_close(m); @@ -845,7 +846,7 @@ static void nf_log_ip_packet(struct net *net, u_int8_t pf, loginfo = &default_loginfo; nf_log_dump_packet_common(m, pf, hooknum, skb, in, - out, loginfo, prefix); + out, loginfo, prefix, net); if (in) dump_mac_header(m, loginfo, skb); @@ -880,7 +881,7 @@ static void nf_log_ip6_packet(struct net *net, u_int8_t pf, loginfo = &default_loginfo; nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, - loginfo, prefix); + loginfo, prefix, net); if (in) dump_mac_header(m, loginfo, skb); @@ -916,7 +917,7 @@ static void nf_log_unknown_packet(struct net *net, u_int8_t pf, loginfo = &default_loginfo; nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo, - prefix); + prefix, net); dump_mac_header(m, loginfo, skb); diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index 3dfcb3ac5cb44..e2f334f70281f 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -84,7 +84,7 @@ static void __nf_queue_entry_init_physdevs(struct nf_queue_entry *entry) const struct sk_buff *skb = entry->skb; if (nf_bridge_info_exists(skb)) { - entry->physin = nf_bridge_get_physindev(skb); + entry->physin = nf_bridge_get_physindev(skb, entry->state.net); entry->physout = nf_bridge_get_physoutdev(skb); } else { entry->physin = NULL; diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 134e05d31061e..ad93dd77e6071 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -463,7 +463,8 @@ __build_packet_message(struct nfnl_log_net *log, const struct net_device *outdev, const char *prefix, unsigned int plen, const struct nfnl_ct_hook *nfnl_ct, - struct nf_conn *ct, enum ip_conntrack_info ctinfo) + struct nf_conn *ct, enum ip_conntrack_info ctinfo, + struct net *net) { struct nfulnl_msg_packet_hdr pmsg; struct nlmsghdr *nlh; @@ -804,7 +805,7 @@ nfulnl_log_packet(struct net *net, __build_packet_message(log, inst, skb, data_len, pf, hooknum, in, out, prefix, plen, - nfnl_ct, ct, ctinfo); + nfnl_ct, ct, ctinfo, net); if (inst->qlen >= qthreshold) __nfulnl_flush(inst); diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c index ec6ed6fda96c5..343e65f377d44 100644 --- a/net/netfilter/xt_physdev.c +++ b/net/netfilter/xt_physdev.c @@ -59,7 +59,7 @@ physdev_mt(const struct sk_buff *skb, struct xt_action_param *par) (!!outdev ^ !(info->invert & XT_PHYSDEV_OP_BRIDGED))) return false; - physdev = nf_bridge_get_physindev(skb); + physdev = nf_bridge_get_physindev(skb, xt_net(par)); indev = physdev ? physdev->name : NULL; if ((info->bitmask & XT_PHYSDEV_OP_ISIN &&