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

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

netfilter: use sk_fullsock() helper 



Upcoming request sockets have TCP_NEW_SYN_RECV state and should
be special cased a bit like TCP_TIME_WAIT sockets.

Signed-off-by; Eric Dumazet <edumazet@google.com>

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2497395

net/netfilter/ipvs/ip_vs_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static inline void maybe_update_pmtu(int skb_af, struct sk_buff *skb, int mtu) 
	struct sock *sk = skb->sk;

	struct rtable *ort = skb_rtable(skb);



	if (!skb->dev && sk && sk->sk_state != TCP_TIME_WAIT)

	if (!skb->dev && sk && sk_fullsock(sk))

		ort->dst.ops->update_pmtu(&ort->dst, sk, NULL, mtu);

}

net/netfilter/nf_log_common.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ EXPORT_SYMBOL_GPL(nf_log_dump_tcp_header); 


void nf_log_dump_sk_uid_gid(struct nf_log_buf *m, struct sock *sk)

{

	if (!sk || sk->sk_state == TCP_TIME_WAIT)

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

		return;



	read_lock_bh(&sk->sk_callback_lock);

net/netfilter/nfnetlink_log.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ __build_packet_message(struct nfnl_log_net *log, 


	/* UID */

	sk = skb->sk;

	if (sk && sk->sk_state != TCP_TIME_WAIT) {

	if (sk && sk_fullsock(sk)) {

		read_lock_bh(&sk->sk_callback_lock);

		if (sk->sk_socket && sk->sk_socket->file) {

			struct file *file = sk->sk_socket->file;

net/netfilter/nfnetlink_queue_core.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int nfqnl_put_sk_uidgid(struct sk_buff *skb, struct sock *sk) 
{

	const struct cred *cred;



	if (sk->sk_state == TCP_TIME_WAIT)

	if (!sk_fullsock(sk))

		return 0;



	read_lock_bh(&sk->sk_callback_lock);

net/netfilter/nft_meta.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void nft_meta_get_eval(const struct nft_expr *expr, 
		*(u16 *)dest->data = out->type;

		break;

	case NFT_META_SKUID:

		if (skb->sk == NULL || skb->sk->sk_state == TCP_TIME_WAIT)

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

			goto err;



		read_lock_bh(&skb->sk->sk_callback_lock);
@@ -99,7 +99,7 @@ void nft_meta_get_eval(const struct nft_expr *expr, 
		read_unlock_bh(&skb->sk->sk_callback_lock);

		break;

	case NFT_META_SKGID:

		if (skb->sk == NULL || skb->sk->sk_state == TCP_TIME_WAIT)

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

			goto err;



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