Messages in this thread Patch in this message | | | Date | Tue, 22 Nov 2005 13:08:21 -0800 | From | Chris Wright <> | Subject | [patch 16/23] [PATCH] [IPV6]: Fix memory management error during setting up new advapi sockopts. |
| |
-stable review patch. If anyone has any objections, please let us know. ------------------
--- net/ipv6/exthdrs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- linux-2.6.14.2.orig/net/ipv6/exthdrs.c +++ linux-2.6.14.2/net/ipv6/exthdrs.c @@ -628,6 +628,7 @@ ipv6_renew_options(struct sock *sk, stru 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, stru return opt2; out: - sock_kfree_s(sk, p, tot_len); + sock_kfree_s(sk, opt2, opt2->tot_len); return ERR_PTR(err); } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |