From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Florian Westphal <fw@strlen.de>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@openvz.org, Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Subject: [PATCH 2/4] netfilter: nf_queue: remove excess nf_bridge variable
Date: Wed, 10 Jan 2024 19:00:12 +0800 [thread overview]
Message-ID: <20240110110451.5473-3-ptikhomirov@virtuozzo.com> (raw)
In-Reply-To: <20240110110451.5473-1-ptikhomirov@virtuozzo.com>
We don't really need nf_bridge variable here. And nf_bridge_info_exists
is better replacement for nf_bridge_info_get in case we are only
checking for existance.
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
net/netfilter/nf_queue.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 63d1516816b1f..3dfcb3ac5cb44 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -82,10 +82,8 @@ static void __nf_queue_entry_init_physdevs(struct nf_queue_entry *entry)
{
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
const struct sk_buff *skb = entry->skb;
- struct nf_bridge_info *nf_bridge;
- nf_bridge = nf_bridge_info_get(skb);
- if (nf_bridge) {
+ if (nf_bridge_info_exists(skb)) {
entry->physin = nf_bridge_get_physindev(skb);
entry->physout = nf_bridge_get_physoutdev(skb);
} else {
--
2.43.0
next prev parent reply other threads:[~2024-01-10 11:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 11:00 [PATCH 0/4] netlink: bridge: fix nf_bridge->physindev use after free Pavel Tikhomirov
2024-01-10 11:00 ` [PATCH 1/4] netfilter: nfnetlink_log: use proper helper for fetching physinif Pavel Tikhomirov
2024-01-10 13:33 ` Florian Westphal
2024-01-10 13:48 ` Pavel Tikhomirov
2024-01-10 14:01 ` Florian Westphal
2024-01-10 11:00 ` Pavel Tikhomirov [this message]
2024-01-10 11:00 ` [PATCH 3/4] netfilter: propagate net to nf_bridge_get_physindev Pavel Tikhomirov
2024-01-10 13:34 ` Florian Westphal
2024-01-10 14:14 ` [PATCH v2 " Pavel Tikhomirov
2024-01-11 14:40 ` Paolo Abeni
2024-01-11 15:10 ` Pavel Tikhomirov
2024-01-10 11:00 ` [PATCH 4/4] netfilter: bridge: replace physindev with physinif in nf_bridge_info Pavel Tikhomirov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240110110451.5473-3-ptikhomirov@virtuozzo.com \
--to=ptikhomirov@virtuozzo.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=kernel@openvz.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®