lkml.org 
[lkml]   [2018]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 112/189] smc: fix sendpage() call
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Stefan Raspl <stefan.raspl@linux.ibm.com>

    [ Upstream commit bda27ff5c4526f80a7620a94ecfe8dca153e3696 ]

    The sendpage() call grabs the sock lock before calling the default
    implementation - which tries to grab it once again.

    Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
    Signed-off-by: Ursula Braun <ubraun@linux.ibm.com><
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/smc/af_smc.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/net/smc/af_smc.c
    +++ b/net/smc/af_smc.c
    @@ -1264,8 +1264,11 @@ static ssize_t smc_sendpage(struct socke

    smc = smc_sk(sk);
    lock_sock(sk);
    - if (sk->sk_state != SMC_ACTIVE)
    + if (sk->sk_state != SMC_ACTIVE) {
    + release_sock(sk);
    goto out;
    + }
    + release_sock(sk);
    if (smc->use_fallback)
    rc = kernel_sendpage(smc->clcsock, page, offset,
    size, flags);
    @@ -1273,7 +1276,6 @@ static ssize_t smc_sendpage(struct socke
    rc = sock_no_sendpage(sock, page, offset, size, flags);

    out:
    - release_sock(sk);
    return rc;
    }


    \
     
     \ /
      Last update: 2018-06-18 10:57    [W:5.148 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site