Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aed8225 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netfilter: nft_meta: use skb_to_full_sk() helper 



SYNACK packets might be attached to request sockets.

Fixes: ca6fb065 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02a56c81

net/netfilter/nft_meta.c

+20 −16
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ void nft_meta_get_eval(const struct nft_expr *expr, 
	const struct nft_meta *priv = nft_expr_priv(expr);

	const struct sk_buff *skb = pkt->skb;

	const struct net_device *in = pkt->in, *out = pkt->out;

	struct sock *sk;

	u32 *dest = &regs->data[priv->dreg];



	switch (priv->key) {
@@ -86,33 +87,35 @@ void nft_meta_get_eval(const struct nft_expr *expr, 
		*(u16 *)dest = out->type;

		break;

	case NFT_META_SKUID:

		if (skb->sk == NULL || !sk_fullsock(skb->sk))

		sk = skb_to_full_sk(skb);

		if (!sk || !sk_fullsock(sk))

			goto err;



		read_lock_bh(&skb->sk->sk_callback_lock);

		if (skb->sk->sk_socket == NULL ||

		    skb->sk->sk_socket->file == NULL) {

			read_unlock_bh(&skb->sk->sk_callback_lock);

		read_lock_bh(&sk->sk_callback_lock);

		if (sk->sk_socket == NULL ||

		    sk->sk_socket->file == NULL) {

			read_unlock_bh(&sk->sk_callback_lock);

			goto err;

		}



		*dest =	from_kuid_munged(&init_user_ns,

				skb->sk->sk_socket->file->f_cred->fsuid);

		read_unlock_bh(&skb->sk->sk_callback_lock);

				sk->sk_socket->file->f_cred->fsuid);

		read_unlock_bh(&sk->sk_callback_lock);

		break;

	case NFT_META_SKGID:

		if (skb->sk == NULL || !sk_fullsock(skb->sk))

		sk = skb_to_full_sk(skb);

		if (!sk || !sk_fullsock(sk))

			goto err;



		read_lock_bh(&skb->sk->sk_callback_lock);

		if (skb->sk->sk_socket == NULL ||

		    skb->sk->sk_socket->file == NULL) {

			read_unlock_bh(&skb->sk->sk_callback_lock);

		read_lock_bh(&sk->sk_callback_lock);

		if (sk->sk_socket == NULL ||

		    sk->sk_socket->file == NULL) {

			read_unlock_bh(&sk->sk_callback_lock);

			goto err;

		}

		*dest =	from_kgid_munged(&init_user_ns,

				 skb->sk->sk_socket->file->f_cred->fsgid);

		read_unlock_bh(&skb->sk->sk_callback_lock);

				 sk->sk_socket->file->f_cred->fsgid);

		read_unlock_bh(&sk->sk_callback_lock);

		break;

#ifdef CONFIG_IP_ROUTE_CLASSID

	case NFT_META_RTCLASSID: {
@@ -168,9 +171,10 @@ void nft_meta_get_eval(const struct nft_expr *expr, 
		break;

#ifdef CONFIG_CGROUP_NET_CLASSID

	case NFT_META_CGROUP:

		if (skb->sk == NULL || !sk_fullsock(skb->sk))

		sk = skb_to_full_sk(skb);

		if (!sk || !sk_fullsock(sk))

			goto err;

		*dest = skb->sk->sk_classid;

		*dest = sk->sk_classid;

		break;

#endif

	default: