Skip to content

Commit df122f5

Browse files
Florian Westphalummakynes
authored andcommitted
netfilter: ingress: translate 0 nf_hook_slow retval to -1
The caller assumes that < 0 means that skb was stolen (or free'd). All other return values continue skb processing. nf_hook_slow returns 3 different return value types: A) a (negative) errno value: the skb was dropped (NF_DROP, e.g. by iptables '-j DROP' rule). B) 0. The skb was stolen by the hook or queued to userspace. C) 1. all hooks returned NF_ACCEPT so the caller should invoke the okfn so packet processing can continue. nft ingress facility currently doesn't have the 'okfn' that the NF_HOOK() macros use; there is no nfqueue support either. So 1 means that nf_hook_ingress() caller should go on processing the skb. In order to allow use of NF_STOLEN from ingress we need to translate this to an errno number, else we'd crash because we continue with already-free'd (or about to be free-d) skb. The errno value isn't checked, its just important that its less than 0, so return -1. Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 1ed9887 commit df122f5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

include/linux/netfilter_ingress.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ static inline int nf_hook_ingress(struct sk_buff *skb)
1919
{
2020
struct nf_hook_entry *e = rcu_dereference(skb->dev->nf_hooks_ingress);
2121
struct nf_hook_state state;
22+
int ret;
2223

2324
/* Must recheck the ingress hook head, in the event it became NULL
2425
* after the check in nf_hook_ingress_active evaluated to true.
@@ -29,7 +30,11 @@ static inline int nf_hook_ingress(struct sk_buff *skb)
2930
nf_hook_state_init(&state, NF_NETDEV_INGRESS,
3031
NFPROTO_NETDEV, skb->dev, NULL, NULL,
3132
dev_net(skb->dev), NULL);
32-
return nf_hook_slow(skb, &state, e);
33+
ret = nf_hook_slow(skb, &state, e);
34+
if (ret == 0)
35+
return -1;
36+
37+
return ret;
3338
}
3439

3540
static inline void nf_hook_ingress_init(struct net_device *dev)

0 commit comments

Comments
 (0)