lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 029/342] ipv4: fix memory leaks in ip_cmsg_send() callers
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 919483096bfe75dda338e98d56da91a263746a0a ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/ip_sockglue.c | 2 ++
    net/ipv4/ping.c | 4 +++-
    net/ipv4/raw.c | 4 +++-
    net/ipv4/udp.c | 4 +++-
    4 files changed, 11 insertions(+), 3 deletions(-)

    --- a/net/ipv4/ip_sockglue.c
    +++ b/net/ipv4/ip_sockglue.c
    @@ -249,6 +249,8 @@ int ip_cmsg_send(struct net *net, struct
    switch (cmsg->cmsg_type) {
    case IP_RETOPTS:
    err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));
    +
    + /* Our caller is responsible for freeing ipc->opt */
    err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg),
    err < 40 ? err : 40);
    if (err)
    --- a/net/ipv4/ping.c
    +++ b/net/ipv4/ping.c
    @@ -746,8 +746,10 @@ static int ping_v4_sendmsg(struct sock *

    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;
    }
    --- a/net/ipv4/raw.c
    +++ b/net/ipv4/raw.c
    @@ -547,8 +547,10 @@ static int raw_sendmsg(struct sock *sk,

    if (msg->msg_controllen) {
    err = ip_cmsg_send(net, msg, &ipc, false);
    - if (err)
    + if (unlikely(err)) {
    + kfree(ipc.opt);
    goto out;
    + }
    if (ipc.opt)
    free = 1;
    }
    --- a/net/ipv4/udp.c
    +++ b/net/ipv4/udp.c
    @@ -966,8 +966,10 @@ int udp_sendmsg(struct sock *sk, struct
    if (msg->msg_controllen) {
    err = ip_cmsg_send(sock_net(sk), msg, &ipc,
    sk->sk_family == AF_INET6);
    - if (err)
    + if (unlikely(err)) {
    + kfree(ipc.opt);
    return err;
    + }
    if (ipc.opt)
    free = 1;
    connected = 0;
    \
     
     \ /
      Last update: 2016-03-02 03:21    [W:4.252 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site