iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: return proper error if sock_queue_rcv_skb() fails

Browse Source 
Improve error handling at cmd_status() and cmd_complete()

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan
2011-10-14 19:20:01 -03:00
parent 33ca954daf
commit 56b7d13785
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/bluetooth/mgmt.c
View File

@ -48,6 +48,7 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
struct sk_buff *skb; struct sk_buff *skb;
struct mgmt_hdr *hdr; struct mgmt_hdr *hdr;
struct mgmt_ev_cmd_status *ev; struct mgmt_ev_cmd_status *ev;
int err;
BT_DBG("sock %p, index %u, cmd %u, status %u", sk, index, cmd, status); BT_DBG("sock %p, index %u, cmd %u, status %u", sk, index, cmd, status);
@ -65,10 +66,11 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
ev->status = status; ev->status = status;
put_unaligned_le16(cmd, &ev->opcode); put_unaligned_le16(cmd, &ev->opcode);
if (sock_queue_rcv_skb(sk, skb) < 0) err = sock_queue_rcv_skb(sk, skb);
if (err < 0)
kfree_skb(skb); kfree_skb(skb);
return 0; return err;
} }
static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp, static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
@ -77,6 +79,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
struct sk_buff *skb; struct sk_buff *skb;
struct mgmt_hdr *hdr; struct mgmt_hdr *hdr;
struct mgmt_ev_cmd_complete *ev; struct mgmt_ev_cmd_complete *ev;
int err;
BT_DBG("sock %p", sk); BT_DBG("sock %p", sk);
@ -96,10 +99,11 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
if (rp) if (rp)
memcpy(ev->data, rp, rp_len); memcpy(ev->data, rp, rp_len);
if (sock_queue_rcv_skb(sk, skb) < 0) err = sock_queue_rcv_skb(sk, skb);
if (err < 0)
kfree_skb(skb); kfree_skb(skb);
return 0; return err;;
} }
static int read_version(struct sock *sk) static int read_version(struct sock *sk)