Skip to content

Commit 2439f1f

Browse files
committed
netfilter: nf_queue: remove excess nf_bridge variable
jira LE-3201 cve CVE-2024-35839 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.27.1.rt7.368.el8_10 commit-author Pavel Tikhomirov <[email protected]> commit aeaa440 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 <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]> (cherry picked from commit aeaa440) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 2d90c69 commit 2439f1f

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

net/netfilter/nf_queue.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,8 @@ static void __nf_queue_entry_init_physdevs(struct nf_queue_entry *entry)
8282
{
8383
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
8484
const struct sk_buff *skb = entry->skb;
85-
struct nf_bridge_info *nf_bridge;
8685

87-
nf_bridge = nf_bridge_info_get(skb);
88-
if (nf_bridge) {
86+
if (nf_bridge_info_exists(skb)) {
8987
entry->physin = nf_bridge_get_physindev(skb);
9088
entry->physout = nf_bridge_get_physoutdev(skb);
9189
} else {

0 commit comments

Comments
 (0)