Merge "msm: camera: mem: Validate return value of dma_buf_get" into dev/msm-4.14-camx (47bc95ca) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -433,6 +433,7 @@ static int cam_mem_util_get_dma_buf_fd(size_t len,
		struct dma_buf **buf,
		int *fd)
		{
		struct dma_buf *dmabuf = NULL;
		int rc = 0;

		if (!buf \|\| !fd) {
		@@ -456,7 +457,11 @@ static int cam_mem_util_get_dma_buf_fd(size_t len,
		* when we close fd, refcount becomes 1 and when we do
		* dmap_put_buf, ref count becomes 0 and memory will be freed.
		*/
		dma_buf_get(*fd);
		dmabuf = dma_buf_get(*fd);
		if (IS_ERR_OR_NULL(dmabuf)) {
		CAM_ERR(CAM_MEM, "dma_buf_get failed, fd=%d", fd);
		rc = -EINVAL;
		}

		return rc;