lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 606/633] tty: ipwireless: fix error handling
    Date
    From: Tong Zhang <ztong0001@gmail.com>

    [ Upstream commit db332356222d9429731ab9395c89cca403828460 ]

    ipwireless_send_packet() can only return 0 on success and -ENOMEM on
    error, the caller should check non zero for error condition

    Signed-off-by: Tong Zhang <ztong0001@gmail.com>
    Acked-by: David Sterba <dsterba@suse.com>
    Link: https://lore.kernel.org/r/20200821161942.36589-1-ztong0001@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/ipwireless/network.c | 4 ++--
    drivers/tty/ipwireless/tty.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
    index cf20616340a1a..fe569f6294a24 100644
    --- a/drivers/tty/ipwireless/network.c
    +++ b/drivers/tty/ipwireless/network.c
    @@ -117,7 +117,7 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel,
    skb->len,
    notify_packet_sent,
    network);
    - if (ret == -1) {
    + if (ret < 0) {
    skb_pull(skb, 2);
    return 0;
    }
    @@ -134,7 +134,7 @@ static int ipwireless_ppp_start_xmit(struct ppp_channel *ppp_channel,
    notify_packet_sent,
    network);
    kfree(buf);
    - if (ret == -1)
    + if (ret < 0)
    return 0;
    }
    kfree_skb(skb);
    diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
    index fad3401e604d9..23584769fc292 100644
    --- a/drivers/tty/ipwireless/tty.c
    +++ b/drivers/tty/ipwireless/tty.c
    @@ -218,7 +218,7 @@ static int ipw_write(struct tty_struct *linux_tty,
    ret = ipwireless_send_packet(tty->hardware, IPW_CHANNEL_RAS,
    buf, count,
    ipw_write_packet_sent_callback, tty);
    - if (ret == -1) {
    + if (ret < 0) {
    mutex_unlock(&tty->ipw_tty_mutex);
    return 0;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:28    [W:2.238 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site