Explorar o código

Bluetooth: Fix possible NULL pointer dereference in cmd_complete

It is now possible to create command complete event without specific
reply data by passing NULL as reply with len 0. Check pointer before
calling memcpy to avoid undefined behaviour.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Szymon Janc %!s(int64=14) %!d(string=hai) anos
pai
achega
8020c16a6c
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      net/bluetooth/mgmt.c

+ 3 - 1
net/bluetooth/mgmt.c

@@ -92,7 +92,9 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
 
 
 	ev = (void *) skb_put(skb, sizeof(*ev) + rp_len);
 	ev = (void *) skb_put(skb, sizeof(*ev) + rp_len);
 	put_unaligned_le16(cmd, &ev->opcode);
 	put_unaligned_le16(cmd, &ev->opcode);
-	memcpy(ev->data, rp, rp_len);
+
+	if (rp)
+		memcpy(ev->data, rp, rp_len);
 
 
 	if (sock_queue_rcv_skb(sk, skb) < 0)
 	if (sock_queue_rcv_skb(sk, skb) < 0)
 		kfree_skb(skb);
 		kfree_skb(skb);