Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

57bf7440 · John W. Linville · 075163bb · 3f6fa3d4 · 57bf7440
Commit 57bf7440 authored Jun 24, 2013 by John W. Linville
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

net/bluetooth/l2cap_core.c net/bluetooth/l2cap_core.c +1 -1

No files found.
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4333,7 +4333,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn,
 	struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) data;
 	u16 type, result;

-	if (cmd_len != sizeof(*rsp))
+	if (cmd_len < sizeof(*rsp))
 		return -EPROTO;

 	type   = __le16_to_cpu(rsp->type);