Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/

1 files changed, 21 insertions, 1 deletions

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 922549581abc..be6faf311387 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -628,6 +628,7 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
         if (!tot_len)
                 return NULL;
 
+        tot_len += sizeof(*opt2);
         opt2 = sock_kmalloc(sk, tot_len, GFP_ATOMIC);
         if (!opt2)
                 return ERR_PTR(-ENOBUFS);
@@ -668,7 +669,26 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
 
         return opt2;
 out:
-        sock_kfree_s(sk, p, tot_len);
+        sock_kfree_s(sk, opt2, opt2->tot_len);
         return ERR_PTR(err);
 }
 
+struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
+                                          struct ipv6_txoptions *opt)
+{
+        /*
+         * ignore the dest before srcrt unless srcrt is being included.
+         * --yoshfuji
+         */
+        if (opt && opt->dst0opt && !opt->srcrt) {
+                if (opt_space != opt) {
+                        memcpy(opt_space, opt, sizeof(*opt_space));
+                        opt = opt_space;
+                }
+                opt->opt_nflen -= ipv6_optlen(opt->dst0opt);
+                opt->dst0opt = NULL;
+        }
+
+        return opt;
+}
+