lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 12/86] net: avoid NULL deref in inet_ctl_sock_destroy()
    Date
    3.13.11-ckt31 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    [ Upstream commit 8fa677d2706d325d71dab91bf6e6512c05214e37 ]

    Under low memory conditions, tcp_sk_init() and icmp_sk_init()
    can both iterate on all possible cpus and call inet_ctl_sock_destroy(),
    with eventual NULL pointer.

    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    include/net/inet_common.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/include/net/inet_common.h b/include/net/inet_common.h
    index fe7994c..fd1da04 100644
    --- a/include/net/inet_common.h
    +++ b/include/net/inet_common.h
    @@ -40,7 +40,8 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,

    static inline void inet_ctl_sock_destroy(struct sock *sk)
    {
    - sk_release_kernel(sk);
    + if (sk)
    + sk_release_kernel(sk);
    }

    #endif
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-03 00:41    [W:4.099 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site