lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Fix passing NULL to PTR_ERR

Browse Source 
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>
This commit is contained in:
Luiz Augusto von Dentz 2021-09-16 13:10:48 -07:00 committed by Greg Kroah-Hartman
parent 10bacb8917
commit aa2d34cab3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/bluetooth.h
View File

@ -422,7 +422,7 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk,
struct sk_buff *tmp; struct sk_buff *tmp;
tmp = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom); tmp = bt_skb_sendmsg(sk, msg, len, mtu, headroom, tailroom);
if (IS_ERR_OR_NULL(tmp)) { if (IS_ERR(tmp)) {
kfree_skb(skb); kfree_skb(skb);
return tmp; return tmp;
} }

2
net/bluetooth/rfcomm/sock.c
View File

@ -586,7 +586,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, skb = bt_skb_sendmmsg(sk, msg, len, d->mtu, RFCOMM_SKB_HEAD_RESERVE,
RFCOMM_SKB_TAIL_RESERVE); RFCOMM_SKB_TAIL_RESERVE);
if (IS_ERR_OR_NULL(skb)) if (IS_ERR(skb))
return PTR_ERR(skb); return PTR_ERR(skb);
sent = rfcomm_dlc_send(d, skb); sent = rfcomm_dlc_send(d, skb);

2
net/bluetooth/sco.c
View File

@ -720,7 +720,7 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
return -EOPNOTSUPP; return -EOPNOTSUPP;
skb = bt_skb_sendmsg(sk, msg, len, len, 0, 0); skb = bt_skb_sendmsg(sk, msg, len, len, 0, 0);
if (IS_ERR_OR_NULL(skb)) if (IS_ERR(skb))
return PTR_ERR(skb); return PTR_ERR(skb);
lock_sock(sk); lock_sock(sk);