UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: fix return value check 

In case of error, the function bt_skb_alloc() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Wei Yongjun 2013-12-14 21:55:22 +08:00 committed by Marcel Holtmann
parent 05c75e3671
commit 787949039f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/6lowpan.c
View File

@ -336,8 +336,8 @@ static inline int skbuff_copy(void *msg, int len, int count, int mtu,
count = min_t(unsigned int, mtu, len);
tmp = bt_skb_alloc(count, GFP_ATOMIC);
if (IS_ERR(tmp))
return PTR_ERR(tmp);
if (!tmp)
return -ENOMEM;
*frag = tmp;
@ -383,8 +383,8 @@ static struct sk_buff *create_pdu(struct l2cap_conn *conn, void *msg,
BT_DBG("conn %p len %zu mtu %d count %d", conn, len, conn->mtu, count);
skb = bt_skb_alloc(count + L2CAP_HDR_SIZE, GFP_ATOMIC);
if (IS_ERR(skb))
return skb;
if (!skb)
return ERR_PTR(-ENOMEM);
skb->priority = priority;