diff mbox series

[v3,2/4] netfilter: nf_queue: remove excess nf_bridge variable

Message ID 20240111150645.85637-3-ptikhomirov@virtuozzo.com
State New
Headers
Series netlink: bridge: fix nf_bridge->physindev use after free |

Commit Message

Pavel Tikhomirov Jan. 11, 2024, 3:06 p.m. UTC 
  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 existence.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
v3: fix spelling in commit message
---
 net/netfilter/nf_queue.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Simon Horman Jan. 15, 2024, 10:52 a.m. UTC | #1 
On Thu, Jan 11, 2024 at 11:06:38PM +0800, Pavel Tikhomirov wrote:
> 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 existence.
> 
> Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>

Reviewed-by: Simon Horman <horms@kernel.org>
diff mbox series

Patch

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 {