netfilter: nft_socket: make cgroup match work in input too
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nft_socket: make cgroup match work in input too
cgroupv2 helper function ignores the already-looked up sk and uses skb->sk instead.
Just pass sk from the calling function instead; this will make cgroup matching work for udp and tcp in input even when edemux did not set skb->sk already.
---
NB: compile tested only.
net/netfilter/nft_socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/nft_socket.c +3 -4
@@ -37,12 +37,11 @@ static void nft_socket_wildcard(const struct nft_pktinfo *pkt,#ifdef CONFIG_SOCK_CGROUP_DATA static noinline bool -nft_sock_get_eval_cgroupv2 (u32 *dest,const struct nft_pktinfo *pkt,u32 level) +nft_sock_get_eval_cgroupv2 (u32 *dest,struct sock *sk,const struct nft_pktinfo *pkt,u32 level) { -struct sock *sk =skb_to_full_sk (pkt->skb);struct cgroup *cgrp; -if (!sk || !sk_fullsock (sk) || !net_eq (nft_net (pkt),sock_net (sk))) +if (!sk_fullsock (sk))return false; cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data);
@@ -109,7 +108,7 @@ static void nft_socket_eval(const struct nft_expr *expr,break ;#ifdef CONFIG_SOCK_CGROUP_DATA case NFT_SOCKET_CGROUPV2 : -if (!nft_sock_get_eval_cgroupv2 (dest, pkt, priv->level)) { +if (!nft_sock_get_eval_cgroupv2 (dest, sk, pkt, priv->level)) { regs->verdict.code =NFT_BREAK ;return ; }
Signature · 1 line
2.35.1
Quoted 35 lines · Florian Westphal
cgroupv2 helper function ignores the already-looked up sk and uses
skb->skinstead.Just pass sk from the calling function instead; this will make cgroup matching work for udp and tcp in input even when edemux did not set
skb->skalready.Cc Topi Miettinen <[email protected]>Signed-off-by Florian Westphal <[email protected]>---
NB: compile tested only.net/netfilter/nft_socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)net/netfilter/nft_socket.c +2
-3@@ -37,12 +37,11 @@ static void nft_socket_wildcard(const struct nft_pktinfo *pkt,#ifdef CONFIG_SOCK_CGROUP_DATA static noinline bool -nft_sock_get_eval_cgroupv2 (u32 *dest,const struct nft_pktinfo *pkt,u32 level) +nft_sock_get_eval_cgroupv2 (u32 *dest,struct sock *sk,const struct nft_pktinfo *pkt,u32 level) { -struct sock *sk =skb_to_full_sk (pkt->skb);struct cgroup *cgrp; -if (!sk || !sk_fullsock (sk) || !net_eq (nft_net (pkt),sock_net (sk))) +if (!sk_fullsock (sk))return false; cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data);
net/netfilter/nft_socket.c static void nft_socket_eval(const struct nft_expr *expr, · line 114
Quoted 8 lines
net/netfilter/nft_socket.c +1
-1@@ -109,7 +108,7 @@ static void nft_socket_eval(const struct nft_expr *expr,break ;#ifdef CONFIG_SOCK_CGROUP_DATA case NFT_SOCKET_CGROUPV2 : -if (!nft_sock_get_eval_cgroupv2 (dest, pkt, priv->level)) { +if (!nft_sock_get_eval_cgroupv2 (dest, sk, pkt, priv->level)) { regs->verdict.code =NFT_BREAK ;return ; }
Great, now rule 'ct state new socket cgroupv2 level 1 vmap @dict_cgroup_level_1_in' in input filter started matching incoming packets.
-Topi
Pablo Neira Ayuso
maintainerQuoted 6 lines · Florian Westphal
cgroupv2 helper function ignores the already-looked up sk and uses
skb->skinstead.Just pass sk from the calling function instead; this will make cgroup matching work for udp and tcp in input even when edemux did not set
skb->skalready.
Quoted 2 lines
Cc Topi Miettinen <[email protected]>Signed-off-by Florian Westphal <[email protected]>
Quoted 6 lines · Florian Westphal
cgroupv2 helper function ignores the already-looked up sk and uses
skb->skinstead.Just pass sk from the calling function instead; this will make cgroup matching work for udp and tcp in input even when edemux did not set
skb->skalready.
Applied to nf.git, thanks Florian