Commit e41d8b4e authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo F. Padovan

Bluetooth: Add error handling for managment command handlers

The command handlers for bluetooth management messaging should be able
to report errors (such as memory allocation failures) to the higher
levels in the call stack.
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent a40c406c
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#include <net/bluetooth/mgmt.h> #include <net/bluetooth/mgmt.h>
static void cmd_status(struct sock *sk, u16 cmd, u8 status) static int cmd_status(struct sock *sk, u16 cmd, u8 status)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct mgmt_hdr *hdr; struct mgmt_hdr *hdr;
...@@ -39,7 +39,7 @@ static void cmd_status(struct sock *sk, u16 cmd, u8 status) ...@@ -39,7 +39,7 @@ static void cmd_status(struct sock *sk, u16 cmd, u8 status)
skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_ATOMIC); skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_ATOMIC);
if (!skb) if (!skb)
return; return -ENOMEM;
hdr = (void *) skb_put(skb, sizeof(*hdr)); hdr = (void *) skb_put(skb, sizeof(*hdr));
...@@ -52,6 +52,8 @@ static void cmd_status(struct sock *sk, u16 cmd, u8 status) ...@@ -52,6 +52,8 @@ static void cmd_status(struct sock *sk, u16 cmd, u8 status)
if (sock_queue_rcv_skb(sk, skb) < 0) if (sock_queue_rcv_skb(sk, skb) < 0)
kfree_skb(skb); kfree_skb(skb);
return 0;
} }
int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
...@@ -87,10 +89,13 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen) ...@@ -87,10 +89,13 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
switch (opcode) { switch (opcode) {
default: default:
BT_DBG("Unknown op %u", opcode); BT_DBG("Unknown op %u", opcode);
cmd_status(sk, opcode, 0x01); err = cmd_status(sk, opcode, 0x01);
break; break;
} }
if (err < 0)
goto done;
err = msglen; err = msglen;
done: done:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment