commit fad70b515f2b563e336736e0bc41070a512ea4aa
author Linux Build Service Account <lnxbuild@localhost> Fri May 18 01:52:47 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri May 18 01:52:47 2012 -0700
tree c0577c9a7e0627fd575fb3895e24d7e2147c1473
parent c28df6e73915166f50b1c3c3e8e8289439c108d7
parent a435fc678ece863162b02211fe19859825e4bb0d

Merge "msm: camera: Add some error checks" into msm-3.0

drivers/media/video/msm/msm.c

diff --git a/drivers/media/video/msm/msm.c b/drivers/media/video/msm/msm.c
index fa9aace..4447866 100644
--- a/drivers/media/video/msm/msm.c
+++ b/drivers/media/video/msm/msm.c
@@ -286,7 +286,8 @@
 
 	ctrlcmd = (struct msm_ctrl_cmd *)(rcmd->command);
 	value = out->value;
-	if (ctrlcmd->length > 0)
+	if (ctrlcmd->length > 0 && value != NULL &&
+	    ctrlcmd->length <= out->length)
 		memcpy(value, ctrlcmd->value, ctrlcmd->length);
 
 	memcpy(out, ctrlcmd, sizeof(struct msm_ctrl_cmd));