---

yaml --- r: 352575 b: refs/heads/master c: e9a4aa3 h: refs/heads/master i: 352573: 9c16cec 352571: e6f8a10 352567: c6f329a 352559: 2447415 352543: 67c57d8 352511: b38dfb9 v: v3
git-mirror · Feb 8, 2013 · 49ad5f5 · 49ad5f5
1 parent cff6ff8
commit 49ad5f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d3b2046e310b361da93fe6c44bde5522c782da
+refs/heads/master: e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe
diff --git a/trunk/net/nfc/llcp/llcp.c b/trunk/net/nfc/llcp/llcp.c
@@ -549,14 +549,13 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)
 		pr_err("No LLCP device\n");
 		return -ENODEV;
 	}
+	if (gb_len < 3)
+		return -EINVAL;
 
 	memset(local->remote_gb, 0, NFC_MAX_GT_LEN);
 	memcpy(local->remote_gb, gb, gb_len);
 	local->remote_gb_len = gb_len;
 
-	if (local->remote_gb == NULL || local->remote_gb_len == 0)
-		return -ENODEV;
-
 	if (memcmp(local->remote_gb, llcp_magic, 3)) {
 		pr_err("MAC does not support LLCP\n");
 		return -EINVAL;