summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorSzymon Janc2011-03-22 13:12:20 +0100
committerGustavo F. Padovan2011-03-31 19:22:57 +0200
commit8fce6357a9e72c4c9c846f9951895954bfb34ad1 (patch)
treee748707ede664b0fce23b762de370fdc3c51fe3f /net/bluetooth
parentBluetooth: Rename cmd to param in pending_cmd (diff)
downloadkernel-qcow2-linux-8fce6357a9e72c4c9c846f9951895954bfb34ad1.tar.gz
kernel-qcow2-linux-8fce6357a9e72c4c9c846f9951895954bfb34ad1.tar.xz
kernel-qcow2-linux-8fce6357a9e72c4c9c846f9951895954bfb34ad1.zip
Bluetooth: Allow for NULL data in mgmt_pending_add
Since index is in mgmt_hdr it is possible to have mgmt command with no parameters that still needs to add itself to pending list. Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index d0c01230bba9..93f0f04c8bcd 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -239,7 +239,8 @@ static struct pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,
return NULL;
}
- memcpy(cmd->param, data, len);
+ if (data)
+ memcpy(cmd->param, data, len);
cmd->sk = sk;
sock_hold(sk);