lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 49/62] Bluetooth: Fix passing NULL to PTR_ERR
    Date
    From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

    commit 266191aa8d14b84958aaeb5e96ee4e97839e3d87 upstream.

    Passing NULL to PTR_ERR will result in 0 (success), also since the likes of
    bt_skb_sendmsg does never return NULL it is safe to replace the instances of
    IS_ERR_OR_NULL with IS_ERR when checking its return.

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Tested-by: Tedd Ho-Jeong An <tedd.an@intel.com>
    Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/net/bluetooth/bluetooth.h | 2 +-
    net/bluetooth/rfcomm/sock.c | 2 +-
    net/bluetooth/sco.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    --- a/include/net/bluetooth/bluetooth.h
    +++ b/include/net/bluetooth/bluetooth.h
    @@ -422,7 +422,7 @@ static inline struct sk_buff *bt_skb_sen
    struct sk_buff *tmp;

    tmp = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom);
    - if (IS_ERR_OR_NULL(tmp)) {
    + if (IS_ERR(tmp)) {
    kfree_skb(skb);
    return tmp;
    }
    --- a/net/bluetooth/rfcomm/sock.c
    +++ b/net/bluetooth/rfcomm/sock.c
    @@ -586,7 +586,7 @@ static int rfcomm_sock_sendmsg(struct so

    skb = bt_skb_sendmmsg(sk, msg, len, d->mtu, RFCOMM_SKB_HEAD_RESERVE,
    RFCOMM_SKB_TAIL_RESERVE);
    - if (IS_ERR_OR_NULL(skb))
    + if (IS_ERR(skb))
    return PTR_ERR(skb);

    sent = rfcomm_dlc_send(d, skb);
    --- a/net/bluetooth/sco.c
    +++ b/net/bluetooth/sco.c
    @@ -720,7 +720,7 @@ static int sco_sock_sendmsg(struct socke
    return -EOPNOTSUPP;

    skb = bt_skb_sendmsg(sk, msg, len, len, 0, 0);
    - if (IS_ERR_OR_NULL(skb))
    + if (IS_ERR(skb))
    return PTR_ERR(skb);

    lock_sock(sk);

    \
     
     \ /
      Last update: 2022-07-27 18:36    [W:4.186 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site