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

inet: introduce ireq_family 



Before inserting request socks into general hash table,
fill their socket family.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4f06873

include/net/inet_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct inet_request_sock { 
#define ireq_net		req.__req_common.skc_net

#define ireq_state		req.__req_common.skc_state

#define ireq_refcnt		req.__req_common.skc_refcnt

#define ireq_family		req.__req_common.skc_family



	kmemcheck_bitfield_begin(flags);

	u16			snd_wscale : 4,

net/dccp/ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	ireq->ir_loc_addr = ip_hdr(skb)->daddr;

	ireq->ir_rmt_addr = ip_hdr(skb)->saddr;

	write_pnet(&ireq->ireq_net, sock_net(sk));

	ireq->ireq_family = AF_INET;



	/*

	 * Step 3: Process LISTEN state

net/dccp/ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
	ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;

	ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr;

	write_pnet(&ireq->ireq_net, sock_net(sk));

	ireq->ireq_family = AF_INET6;



	if (ipv6_opt_accepted(sk, skb, IP6CB(skb)) ||

	    np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo ||

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk, 
		return -EMSGSIZE;



	r = nlmsg_data(nlh);

	r->idiag_family = sk->sk_family;

	r->idiag_family = ireq->ireq_family;

	r->idiag_state = TCP_SYN_RECV;

	r->idiag_timer = 1;

	r->idiag_retrans = req->num_retrans;

net/ipv4/syncookies.c

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	treq->snt_synack	= tcp_opt.saw_tstamp ? tcp_opt.rcv_tsecr : 0;

	treq->listener		= NULL;

	write_pnet(&ireq->ireq_net, sock_net(sk));

	ireq->ireq_family = AF_INET;



	/* We throwed the options of the initial SYN away, so we hope

	 * the ACK carries the same options again (see RFC1122 4.2.3.8)