diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-31 17:57:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-31 17:57:55 -0700 |
| commit | 92526da4236922d81f696610efd9957641cdc32e (patch) | |
| tree | 465cab96e871f274c6301059fe9d85797d0719dc | |
| parent | 35ca83d6a7e3aa584ec901d8e5d93b665df5a09a (diff) | |
| parent | 76e56268ee2c51cf98027595932aee7b750c25f3 (diff) | |
Merge "msm: ais: cpp fix to check zero length ioctl"
| -rw-r--r-- | drivers/media/platform/msm/ais/pproc/cpp/msm_cpp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/ais/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/ais/pproc/cpp/msm_cpp.c index c9cb0080436a..811ac98beead 100644 --- a/drivers/media/platform/msm/ais/pproc/cpp/msm_cpp.c +++ b/drivers/media/platform/msm/ais/pproc/cpp/msm_cpp.c @@ -2889,6 +2889,8 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg, case MSM_SD_SHUTDOWN: case MSM_SD_NOTIFY_FREEZE: case MSM_SD_UNNOTIFY_FREEZE: + case VIDIOC_MSM_CPP_IOMMU_ATTACH: + case VIDIOC_MSM_CPP_IOMMU_DETACH: break; default: { if (ioctl_ptr == NULL) { @@ -2897,8 +2899,9 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg, } *ioctl_ptr = arg; - if ((*ioctl_ptr == NULL) || - (*ioctl_ptr)->ioctl_ptr == NULL) { + if (((*ioctl_ptr) == NULL) || + ((*ioctl_ptr)->ioctl_ptr == NULL) || + ((*ioctl_ptr)->len == 0)) { pr_err("Error invalid ioctl argument cmd %u", cmd); return -EINVAL; } |