ipv6: Allow request socks to contain IPv6 options.

If set, these will take precedence over the parent's options during
both sending and child creation.  If they're not set, the parent's
options (if any) will be used.

This is to allow the security_inet_conn_request() hook to modify the
IPv6 options in just the same way that it already may do for IPv4.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

3 files changed, 21 insertions, 6 deletions

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 4663a01d5039..3381748bd0f3 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -216,14 +216,17 @@ static int dccp_v6_send_response(const struct sock *sk, struct request_sock *req
         skb = dccp_make_response(sk, dst, req);
         if (skb != NULL) {
                 struct dccp_hdr *dh = dccp_hdr(skb);
+                struct ipv6_txoptions *opt;
 
                 dh->dccph_checksum = dccp_v6_csum_finish(skb,
                                                          &ireq->ir_v6_loc_addr,
                                                          &ireq->ir_v6_rmt_addr);
                 fl6.daddr = ireq->ir_v6_rmt_addr;
                 rcu_read_lock();
-                err = ip6_xmit(sk, skb, &fl6, rcu_dereference(np->opt),
-                               np->tclass);
+                opt = ireq->ipv6_opt;
+                if (!opt)
+                        opt = rcu_dereference(np->opt);
+                err = ip6_xmit(sk, skb, &fl6, opt, np->tclass);
                 rcu_read_unlock();
                 err = net_xmit_eval(err);
         }
@@ -236,6 +239,7 @@ done:
 static void dccp_v6_reqsk_destructor(struct request_sock *req)
 {
         dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
+        kfree(inet_rsk(req)->ipv6_opt);
         kfree_skb(inet_rsk(req)->pktopts);
 }
 
@@ -494,7 +498,9 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk,
          * Yes, keeping reference count would be much more clever, but we make
          * one more one thing there: reattach optmem to newsk.
          */
-        opt = rcu_dereference(np->opt);
+        opt = ireq->ipv6_opt;
+        if (!opt)
+                opt = rcu_dereference(np->opt);
         if (opt) {
                 opt = ipv6_dup_options(newsk, opt);
                 RCU_INIT_POINTER(newnp->opt, opt);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e6e65f79ade8..071174c13bf9 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6146,6 +6146,9 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
 
                 kmemcheck_annotate_bitfield(ireq, flags);
                 ireq->opt = NULL;
+#if IS_ENABLED(CONFIG_IPV6)
+                ireq->pktopts = NULL;
+#endif
                 atomic64_set(&ireq->ir_cookie, 0);
                 ireq->ireq_state = TCP_NEW_SYN_RECV;
                 write_pnet(&ireq->ireq_net, sock_net(sk_listener));
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 711d209f9124..18daddc6001c 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -443,6 +443,7 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst,
 {
         struct inet_request_sock *ireq = inet_rsk(req);
         struct ipv6_pinfo *np = inet6_sk(sk);
+        struct ipv6_txoptions *opt;
         struct flowi6 *fl6 = &fl->u.ip6;
         struct sk_buff *skb;
         int err = -ENOMEM;
@@ -463,8 +464,10 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst,
                         fl6->flowlabel = ip6_flowlabel(ipv6_hdr(ireq->pktopts));
 
                 rcu_read_lock();
-                err = ip6_xmit(sk, skb, fl6, rcu_dereference(np->opt),
-                               np->tclass);
+                opt = ireq->ipv6_opt;
+                if (!opt)
+                        opt = rcu_dereference(np->opt);
+                err = ip6_xmit(sk, skb, fl6, opt, np->tclass);
                 rcu_read_unlock();
                 err = net_xmit_eval(err);
         }
@@ -476,6 +479,7 @@ done:
 
 static void tcp_v6_reqsk_destructor(struct request_sock *req)
 {
+        kfree(inet_rsk(req)->ipv6_opt);
         kfree_skb(inet_rsk(req)->pktopts);
 }
 
@@ -1107,7 +1111,9 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *
            but we make one more one thing there: reattach optmem
            to newsk.
          */
-        opt = rcu_dereference(np->opt);
+        opt = ireq->ipv6_opt;
+        if (!opt)
+                opt = rcu_dereference(np->opt);
         if (opt) {
                 opt = ipv6_dup_options(newsk, opt);
                 RCU_INIT_POINTER(newnp->opt, opt);