diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-02-04 06:23:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-13 05:57:39 -0500 |
| commit | 919483096bfe75dda338e98d56da91a263746a0a (patch) | |
| tree | f7b3a3af7c789efb21850da66bde661e06445d81 /net/ipv4/ping.c | |
| parent | c2bb7bc5c007b7b55087eb05409edc2014f43ca8 (diff) | |
ipv4: fix memory leaks in ip_cmsg_send() callers
Dmitry reported memory leaks of IP options allocated in
ip_cmsg_send() when/if this function returns an error.
Callers are responsible for the freeing.
Many thanks to Dmitry for the report and diagnostic.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ping.c')
| -rw-r--r-- | net/ipv4/ping.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index c117b21b937d..d3a27165f9cc 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -746,8 +746,10 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (msg->msg_controllen) { err = ip_cmsg_send(sock_net(sk), msg, &ipc, false); - if (err) + if (unlikely(err)) { + kfree(ipc.opt); return err; + } if (ipc.opt) free = 1; } |