aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-05-17 04:53:13 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-27 10:34:32 -0700
commit8410e49bf36d9adf4aba8a5cb8e1540da6aec862 (patch)
tree7ccbe4a47fea2830d7989f19a7bc553647035596 /net
parentcc56da01f9325fd72ebf4d759b8333020bdc5f6c (diff)
downloadkernel_samsung_aries-8410e49bf36d9adf4aba8a5cb8e1540da6aec862.zip
kernel_samsung_aries-8410e49bf36d9adf4aba8a5cb8e1540da6aec862.tar.gz
kernel_samsung_aries-8410e49bf36d9adf4aba8a5cb8e1540da6aec862.tar.bz2
ipv6: fix possible crashes in ip6_cork_release()
[ Upstream commit 284041ef21fdf2e0d216ab6b787bc9072b4eb58a ] commit 0178b695fd6b4 ("ipv6: Copy cork options in ip6_append_data") added some code duplication and bad error recovery, leading to potential crash in ip6_cork_release() as kfree() could be called with garbage. use kzalloc() to make sure this wont happen. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: Neal Cardwell <ncardwell@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index ae9f6d4..4e49ab0 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1248,7 +1248,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
if (WARN_ON(np->cork.opt))
return -EINVAL;
- np->cork.opt = kmalloc(opt->tot_len, sk->sk_allocation);
+ np->cork.opt = kzalloc(opt->tot_len, sk->sk_allocation);
if (unlikely(np->cork.opt == NULL))
return -ENOBUFS;