lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 118/281] net: llc: add lock_sock in llc_ui_bind to avoid a race condition
    Date
    From: linzhang <xiaolou4617@gmail.com>

    [ Upstream commit 0908cf4dfef35fc6ac12329007052ebe93ff1081 ]

    There is a race condition in llc_ui_bind if two or more processes/threads
    try to bind a same socket.

    If more processes/threads bind a same socket success that will lead to
    two problems, one is this action is not what we expected, another is
    will lead to kernel in unstable status or oops(in my simple test case,
    cause llc2.ko can't unload).

    The current code is test SOCK_ZAPPED bit to avoid a process to
    bind a same socket twice but that is can't avoid more processes/threads
    try to bind a same socket at the same time.

    So, add lock_sock in llc_ui_bind like others, such as llc_ui_connect.

    Signed-off-by: Lin Zhang <xiaolou4617@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    net/llc/af_llc.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
    index db916cf51ffe..f7caf0f5d9c8 100644
    --- a/net/llc/af_llc.c
    +++ b/net/llc/af_llc.c
    @@ -309,6 +309,8 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
    int rc = -EINVAL;

    dprintk("%s: binding %02X\n", __func__, addr->sllc_sap);
    +
    + lock_sock(sk);
    if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))
    goto out;
    rc = -EAFNOSUPPORT;
    @@ -380,6 +382,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
    out_put:
    llc_sap_put(sap);
    out:
    + release_sock(sk);
    return rc;
    }

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 22:16    [W:3.016 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site