diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2005-11-21 19:07:25 +0900 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-11-24 14:10:11 -0800 |
| commit | 0527c1095dbf42535c9dbffc12e8c41f59d46f86 (patch) | |
| tree | 66de589a5b34cc059e7fd831f563ebeec226716b /net | |
| parent | ebf1bbfda5eaf2f1124328941ae4869e63315a00 (diff) | |
| download | linux-stable-0527c1095dbf42535c9dbffc12e8c41f59d46f86.tar.gz linux-stable-0527c1095dbf42535c9dbffc12e8c41f59d46f86.tar.bz2 linux-stable-0527c1095dbf42535c9dbffc12e8c41f59d46f86.zip | |
[PATCH] Fix memory management error during setting up new advapi sockopts.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/exthdrs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 922549581abc..748577b76d75 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,7 @@ 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); } |