diff options
| author | Eric Dumazet | 2015-03-13 23:51:10 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-03-14 20:05:10 +0100 |
| commit | 16f86165bd0a94a96ab99629828cc9057db50221 (patch) | |
| tree | abb1a7c6f69f2f424dd08e035091945d252dd141 /net/ipv4/tcp_input.c | |
| parent | Merge branch 'tipc-next' (diff) | |
| download | kernel-qcow2-linux-16f86165bd0a94a96ab99629828cc9057db50221.tar.gz kernel-qcow2-linux-16f86165bd0a94a96ab99629828cc9057db50221.tar.xz kernel-qcow2-linux-16f86165bd0a94a96ab99629828cc9057db50221.zip | |
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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index da61a8e75f68..717d437b6ce1 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -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)) |