---

yaml --- r: 325776 b: refs/heads/master c: ad0c6e3 h: refs/heads/master v: v3
git-mirror · Sep 25, 2012 · 113bc9d · 113bc9d
1 parent a4a5121
commit 113bc9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 142e5460a66edbfe881474eb422e86ff61c4bfc7
+refs/heads/master: ad0c6e367ee0d08c4caa19ad0dbd3d752bd39de0
diff --git a/trunk/drivers/staging/dgrp/dgrp_net_ops.c b/trunk/drivers/staging/dgrp/dgrp_net_ops.c
@@ -3156,6 +3156,12 @@ static void dgrp_receive(struct nd_struct *nd)
 						nd->nd_hw_id = b[6];
 						desclen = ((plen - 12) > MAX_DESC_LEN) ? MAX_DESC_LEN :
 							plen - 12;
+
+						if (desclen <= 0) {
+							error = "Response Packet desclen error";
+							goto prot_error;
+						}
+
 						strncpy(nd->nd_ps_desc, b + 12, desclen);
 						nd->nd_ps_desc[desclen] = 0;
 					}