Bluetooth: Fix passing NULL to PTR_ERR

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>

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 3275d57..b85e6d9 100644 (file)
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -474,7 +474,7 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk,
                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;
                }

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 5938af3..4bf4ea6 100644 (file)
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -583,7 +583,7 @@ static int rfcomm_sock_sendmsg(struct socket *sock, struct msghdr *msg,
 
        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);

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 3ed90c5..17ca65f 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -732,7 +732,7 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
                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);