lkml.org 
[lkml]   [2019]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 15/99] Revert "scsi: target: iscsi: cxgbit: fix csk leak"
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

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

    This reverts commit c9cef2c71a89a2c926dae8151f9497e72f889315.

    A wrong commit message was used for the stable commit because of a human
    error (and duplicate commit subject lines).

    This patch reverts this error, and the following patches add the two
    upstream commits.

    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/drivers/target/iscsi/cxgbit/cxgbit_cm.c b/drivers/target/iscsi/cxgbit/cxgbit_cm.c
    index b289b90ae6dc..8de16016b6de 100644
    --- a/drivers/target/iscsi/cxgbit/cxgbit_cm.c
    +++ b/drivers/target/iscsi/cxgbit/cxgbit_cm.c
    @@ -631,11 +631,8 @@ static void cxgbit_send_halfclose(struct cxgbit_sock *csk)

    static void cxgbit_arp_failure_discard(void *handle, struct sk_buff *skb)
    {
    - struct cxgbit_sock *csk = handle;
    -
    pr_debug("%s cxgbit_device %p\n", __func__, handle);
    kfree_skb(skb);
    - cxgbit_put_csk(csk);
    }

    static void cxgbit_abort_arp_failure(void *handle, struct sk_buff *skb)
    @@ -1193,7 +1190,7 @@ cxgbit_pass_accept_rpl(struct cxgbit_sock *csk, struct cpl_pass_accept_req *req)
    rpl5->opt0 = cpu_to_be64(opt0);
    rpl5->opt2 = cpu_to_be32(opt2);
    set_wr_txq(skb, CPL_PRIORITY_SETUP, csk->ctrlq_idx);
    - t4_set_arp_err_handler(skb, csk, cxgbit_arp_failure_discard);
    + t4_set_arp_err_handler(skb, NULL, cxgbit_arp_failure_discard);
    cxgbit_l2t_send(csk->com.cdev, skb, csk->l2t);
    }

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-01-21 15:08    [W:4.469 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site