Merge "soc: hab: add more return error checking" (61da3fb0) · Commits · e / devices / android_kernel_sony_msm8998

drivers/soc/qcom/hab/hab_mem_linux.c

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -79,6 +79,7 @@ static int habmem_get_dma_pages_from_va(unsigned long address,
	vma = find_vma(current->mm, address);		vma = find_vma(current->mm, address);
	if (!vma \|\| !vma->vm_file) {		if (!vma \|\| !vma->vm_file) {
	pr_err("cannot find vma\n");		pr_err("cannot find vma\n");
			rc = -EBADF;
	goto err;		goto err;
	}		}

	@@ -86,6 +87,7 @@ static int habmem_get_dma_pages_from_va(unsigned long address,
	fd = iterate_fd(current->files, 0, match_file, vma->vm_file);		fd = iterate_fd(current->files, 0, match_file, vma->vm_file);
	if (fd == 0) {		if (fd == 0) {
	pr_err("iterate_fd failed\n");		pr_err("iterate_fd failed\n");
			rc = -EBADF;
	goto err;		goto err;
	}		}

	@@ -93,10 +95,16 @@ static int habmem_get_dma_pages_from_va(unsigned long address,
	page_offset = offset/PAGE_SIZE;		page_offset = offset/PAGE_SIZE;

	dmabuf = dma_buf_get(fd - 1);		dmabuf = dma_buf_get(fd - 1);
			if (IS_ERR_OR_NULL(dmabuf)) {
			pr_err("dma_buf_get failed fd %d ret %pK\n", fd, dmabuf);
			rc = -EBADF;
			goto err;
			}

	attach = dma_buf_attach(dmabuf, hab_driver.dev);		attach = dma_buf_attach(dmabuf, hab_driver.dev);
	if (IS_ERR_OR_NULL(attach)) {		if (IS_ERR_OR_NULL(attach)) {
	pr_err("dma_buf_attach failed\n");		pr_err("dma_buf_attach failed\n");
			rc = -EBADF;
	goto err;		goto err;
	}		}

	@@ -104,6 +112,7 @@ static int habmem_get_dma_pages_from_va(unsigned long address,

	if (IS_ERR_OR_NULL(sg_table)) {		if (IS_ERR_OR_NULL(sg_table)) {
	pr_err("dma_buf_map_attachment failed\n");		pr_err("dma_buf_map_attachment failed\n");
			rc = -EBADF;
	goto err;		goto err;
	}		}

	@@ -154,12 +163,16 @@ static int habmem_get_dma_pages_from_fd(int32_t fd,
	int i, j, rc = 0;		int i, j, rc = 0;

	dmabuf = dma_buf_get(fd);		dmabuf = dma_buf_get(fd);
	if (IS_ERR(dmabuf))		if (IS_ERR_OR_NULL(dmabuf)) {
	return PTR_ERR(dmabuf);		pr_err("dma_buf_get failed fd %d ret %pK\n", fd, dmabuf);
			rc = -EBADF;
			goto err;
			}

	attach = dma_buf_attach(dmabuf, hab_driver.dev);		attach = dma_buf_attach(dmabuf, hab_driver.dev);
	if (IS_ERR_OR_NULL(attach)) {		if (IS_ERR_OR_NULL(attach)) {
	pr_err("dma_buf_attach failed\n");		pr_err("dma_buf_attach failed\n");
			rc = -EBADF;
	goto err;		goto err;
	}		}

	@@ -167,6 +180,7 @@ static int habmem_get_dma_pages_from_fd(int32_t fd,

	if (IS_ERR_OR_NULL(sg_table)) {		if (IS_ERR_OR_NULL(sg_table)) {
	pr_err("dma_buf_map_attachment failed\n");		pr_err("dma_buf_map_attachment failed\n");
			rc = -EBADF;
	goto err;		goto err;
	}		}