Skip to content

Commit cbc74fc

Browse files
committed
Merge tag 'nf-24-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Fix nat packets in the related state in OVS, from Brad Cowie. 2) Drop chain reference counter on error path in case chain binding fails. * tag 'nf-24-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf: netfilter: nft_immediate: drop chain reference counter on error netfilter: nf_nat: fix action not being set for all ct states ==================== Link: https://lore.kernel.org/r/20240103113001.137936-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents b77c1e3 + b29be0c commit cbc74fc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

net/netfilter/nf_nat_ovs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@ static int nf_ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct,
7575
}
7676

7777
err = nf_nat_packet(ct, ctinfo, hooknum, skb);
78+
out:
7879
if (err == NF_ACCEPT)
7980
*action |= BIT(maniptype);
80-
out:
81+
8182
return err;
8283
}
8384

net/netfilter/nft_immediate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static int nft_immediate_init(const struct nft_ctx *ctx,
7878
case NFT_GOTO:
7979
err = nf_tables_bind_chain(ctx, chain);
8080
if (err < 0)
81-
return err;
81+
goto err1;
8282
break;
8383
default:
8484
break;

0 commit comments

Comments
 (0)