tcp: pass fl6 to inet6_csk_route_req()

This commit changes inet_csk_route_req() so that it uses a pointer to
a struct flowi6, rather than allocating its own on the stack. This
brings its behavior in line with its IPv4 cousin,
inet_csk_route_req(), and allows a follow-on patch to fix a dst leak.

Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 13 deletions

diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index e23d35424ca9..bceb14450a1d 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -55,26 +55,26 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict);
 
 struct dst_entry *inet6_csk_route_req(struct sock *sk,
+                                      struct flowi6 *fl6,
                                       const struct request_sock *req)
 {
         struct inet6_request_sock *treq = inet6_rsk(req);
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct in6_addr *final_p, final;
         struct dst_entry *dst;
-        struct flowi6 fl6;
-
-        memset(&fl6, 0, sizeof(fl6));
-        fl6.flowi6_proto = IPPROTO_TCP;
-        fl6.daddr = treq->rmt_addr;
-        final_p = fl6_update_dst(&fl6, np->opt, &final);
-        fl6.saddr = treq->loc_addr;
-        fl6.flowi6_oif = treq->iif;
-        fl6.flowi6_mark = sk->sk_mark;
-        fl6.fl6_dport = inet_rsk(req)->rmt_port;
-        fl6.fl6_sport = inet_rsk(req)->loc_port;
-        security_req_classify_flow(req, flowi6_to_flowi(&fl6));
 
-        dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
+        memset(fl6, 0, sizeof(*fl6));
+        fl6->flowi6_proto = IPPROTO_TCP;
+        fl6->daddr = treq->rmt_addr;
+        final_p = fl6_update_dst(fl6, np->opt, &final);
+        fl6->saddr = treq->loc_addr;
+        fl6->flowi6_oif = treq->iif;
+        fl6->flowi6_mark = sk->sk_mark;
+        fl6->fl6_dport = inet_rsk(req)->rmt_port;
+        fl6->fl6_sport = inet_rsk(req)->loc_port;
+        security_req_classify_flow(req, flowi6_to_flowi(fl6));
+
+        dst = ip6_dst_lookup_flow(sk, fl6, final_p, false);
         if (IS_ERR(dst))
                 return NULL;