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

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

inet: fill request sock ir_iif for IPv4 



Once request socks will be in ehash table, they will need to have
a valid ir_iff field.

This is currently true only for IPv6. This patch extends support
for IPv4 as well.

This means inet_diag_fill_req() can now properly use ir_iif,
which is better for IPv6 link locals anyway, as request sockets
and established sockets will propagate consistent netlink idiag_if.

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

net/dccp/ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	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;



	/*

	 * Step 3: Process LISTEN state

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk, 
	r->idiag_timer = 1;

	r->idiag_retrans = req->num_retrans;



	r->id.idiag_if = sk->sk_bound_dev_if;

	r->id.idiag_if = ireq->ir_iif;



	BUILD_BUG_ON(offsetof(struct inet_request_sock, ir_cookie) !=

		     offsetof(struct sock, sk_cookie));

net/ipv4/syncookies.c

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	write_pnet(&ireq->ireq_net, sock_net(sk));

	ireq->ireq_family = AF_INET;



	ireq->ir_iif = sk->sk_bound_dev_if;



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

	 */

net/ipv4/tcp_input.c

+3 −0
Original line number Diff line number Diff line
@@ -5967,6 +5967,9 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, 
	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;



	af_ops->init_req(req, sk, skb);



	if (security_inet_conn_request(sk, skb, req))

net/ipv6/tcp_ipv6.c

+0 −2
Original line number Diff line number Diff line
@@ -734,8 +734,6 @@ static void tcp_v6_init_req(struct request_sock *req, struct sock *sk, 
	ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;

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



	ireq->ir_iif = sk->sk_bound_dev_if;



	/* So that link locals have meaning */

	if (!sk->sk_bound_dev_if &&

	    ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL)