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

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

tcp: constify listener socket in tcp_v[46]_init_req() 



Soon, listener socket spinlock will no longer be held,
add const arguments to tcp_v[46]_init_req() to make clear these
functions can not mess socket fields.

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

include/net/tcp.h

+2 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,8 @@ struct tcp_request_sock_ops { 
					  const struct sock *sk,

					  const struct sk_buff *skb);

#endif

	void (*init_req)(struct request_sock *req, struct sock *sk,

	void (*init_req)(struct request_sock *req,

			 const struct sock *sk_listener,

			 struct sk_buff *skb);

#ifdef CONFIG_SYN_COOKIES

	__u32 (*cookie_init_seq)(struct sock *sk, const struct sk_buff *skb,

net/ipv4/tcp_ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,8 @@ static bool tcp_v4_inbound_md5_hash(struct sock *sk, 
}

#endif



static void tcp_v4_init_req(struct request_sock *req, struct sock *sk_listener,

static void tcp_v4_init_req(struct request_sock *req,

			    const struct sock *sk_listener,

			    struct sk_buff *skb)

{

	struct inet_request_sock *ireq = inet_rsk(req);

net/ipv6/tcp_ipv6.c

+5 −4
Original line number Diff line number Diff line
@@ -663,22 +663,23 @@ static bool tcp_v6_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb) 
}

#endif



static void tcp_v6_init_req(struct request_sock *req, struct sock *sk,

static void tcp_v6_init_req(struct request_sock *req,

			    const struct sock *sk_listener,

			    struct sk_buff *skb)

{

	struct inet_request_sock *ireq = inet_rsk(req);

	struct ipv6_pinfo *np = inet6_sk(sk);

	const struct ipv6_pinfo *np = inet6_sk(sk_listener);



	ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;

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



	/* So that link locals have meaning */

	if (!sk->sk_bound_dev_if &&

	if (!sk_listener->sk_bound_dev_if &&

	    ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL)

		ireq->ir_iif = tcp_v6_iif(skb);



	if (!TCP_SKB_CB(skb)->tcp_tw_isn &&

	    (ipv6_opt_accepted(sk, skb, &TCP_SKB_CB(skb)->header.h6) ||

	    (ipv6_opt_accepted(sk_listener, skb, &TCP_SKB_CB(skb)->header.h6) ||

	     np->rxopt.bits.rxinfo ||

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

	     np->rxopt.bits.rxohlim || np->repflow)) {