瀏覽代碼

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: Johan Hedberg <johan.hedberg@nokia.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Johan Hedberg 14 年之前
父節點
當前提交
e41d8b4e13
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      net/bluetooth/mgmt.c

+ 8 - 3
net/bluetooth/mgmt.c

@@ -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)
 
 
 	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)
 
 
 	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)
 	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: