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

inet: add sk_listener argument to inet_reqsk_alloc() 



listener socket can be used to set net pointer, and will
be later used to hold a reference on listener.

Add a const qualifier to first argument (struct request_sock_ops *),
and factorize all write_pnet(&ireq->ireq_net, sock_net(sk));

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

include/net/inet_sock.h

+6 −3
Original line number Diff line number Diff line
@@ -244,16 +244,19 @@ static inline unsigned int __inet_ehashfn(const __be32 laddr, 
			    initval);

}



static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops)

static inline struct request_sock *

inet_reqsk_alloc(const struct request_sock_ops *ops, struct sock *sk_listener)

{

	struct request_sock *req = reqsk_alloc(ops);



	if (req) {

		struct inet_request_sock *ireq = inet_rsk(req);



	if (req != NULL) {

		kmemcheck_annotate_bitfield(ireq, flags);

		ireq->opt = NULL;

		atomic64_set(&ireq->ir_cookie, 0);

		ireq->ireq_state = TCP_NEW_SYN_RECV;

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



		/* Following is temporary. It is coupled with debugging

		 * helpers in reqsk_put() & reqsk_free()

net/dccp/ipv4.c

+1 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1)

		goto drop;



	req = inet_reqsk_alloc(&dccp_request_sock_ops);

	req = inet_reqsk_alloc(&dccp_request_sock_ops, sk);

	if (req == NULL)

		goto drop;
@@ -641,7 +641,6 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	ireq = inet_rsk(req);

	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;

	ireq->ir_iif = sk->sk_bound_dev_if;

net/dccp/ipv6.c

+1 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
	if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1)

		goto drop;



	req = inet_reqsk_alloc(&dccp6_request_sock_ops);

	req = inet_reqsk_alloc(&dccp6_request_sock_ops, sk);

	if (req == NULL)

		goto drop;
@@ -403,7 +403,6 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
	ireq = inet_rsk(req);

	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)) ||

net/ipv4/syncookies.c

+1 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
		goto out;



	ret = NULL;

	req = inet_reqsk_alloc(&tcp_request_sock_ops); /* for safety */

	req = inet_reqsk_alloc(&tcp_request_sock_ops, sk); /* for safety */

	if (!req)

		goto out;
@@ -346,7 +346,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	req->ts_recent		= tcp_opt.saw_tstamp ? tcp_opt.rcv_tsval : 0;

	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;



	ireq->ir_iif = sk->sk_bound_dev_if;

net/ipv4/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -6004,7 +6004,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, 
		goto drop;

	}



	req = inet_reqsk_alloc(rsk_ops);

	req = inet_reqsk_alloc(rsk_ops, sk);

	if (!req)

		goto drop;
@@ -6020,7 +6020,6 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, 


	tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;

	tcp_openreq_init(req, &tmp_opt, skb, sk);

	write_pnet(&inet_rsk(req)->ireq_net, sock_net(sk));



	/* Note: tcp_v6_init_req() might override ir_iif for link locals */

	inet_rsk(req)->ir_iif = sk->sk_bound_dev_if;

CRA Git | Maintained and supported by SUSTech CRA and CCSE