diff --git a/[refs] b/[refs]
index 9c21284fa97f..cad2a27212a3 100644
--- 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
index d9d6b6709e4e..ab839ea3b44c 100644
--- 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;
 					}