diff --git a/[refs] b/[refs]
index 5eadc1ad2a0b..398f3904c0e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fac6c290f9e7ac98256e9deaa668f6c2c305cf2
+refs/heads/master: b04462a143afde542ad9e5a1df4fcfbff6d30249
diff --git a/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c b/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
index b23591b0f414..faf8304f55e2 100644
--- a/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -872,7 +872,11 @@ u32 procwrap_load(union trapped_args *args, void *pr_ctxt)
 		/* number of elements in the envp array including NULL */
 		count = 0;
 		do {
-			get_user(temp, args->args_proc_load.user_envp + count);
+			if (get_user(temp,
+				     args->args_proc_load.user_envp + count)) {
+				status = -EFAULT;
+				goto func_cont;
+			}
 			count++;
 		} while (temp);
 		envp = kmalloc(count * sizeof(u8 *), GFP_KERNEL);