Merge "iommu: iommu-debug: don't pass null character to copy_to_user" (da99eb5f) · Commits · e / devices / android_kernel_sony_msm8998

drivers/iommu/iommu-debug.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1403,7 +1403,7 @@ static ssize_t iommu_debug_virt_addr_read(struct file file, char __user ubuf,
		else
		snprintf(buf, 100, "0x%pK\n", virt_addr);

		buflen = min(count, strlen(buf)+1);
		buflen = min(count, strlen(buf));
		if (copy_to_user(ubuf, buf, buflen)) {
		pr_err("Couldn't copy_to_user\n");
		retval = -EFAULT;
		@@ -1527,7 +1527,7 @@ static ssize_t iommu_debug_pte_read(struct file file, char __user ubuf,
		else
		snprintf(buf, 100, "pte=%016llx\n", pte);

		buflen = min(count, strlen(buf)+1);
		buflen = min(count, strlen(buf));
		if (copy_to_user(ubuf, buf, buflen)) {
		pr_err("Couldn't copy_to_user\n");
		retval = -EFAULT;
		@@ -1596,7 +1596,7 @@ static ssize_t iommu_debug_atos_read(struct file file, char __user ubuf,
		snprintf(buf, 100, "%pa\n", &phys);
		}

		buflen = min(count, strlen(buf)+1);
		buflen = min(count, strlen(buf));
		if (copy_to_user(ubuf, buf, buflen)) {
		pr_err("Couldn't copy_to_user\n");
		retval = -EFAULT;
		@@ -1649,7 +1649,7 @@ static ssize_t iommu_debug_dma_atos_read(struct file file, char __user ubuf,
		else
		snprintf(buf, 100, "%pa\n", &phys);

		buflen = min(count, strlen(buf)+1);
		buflen = min(count, strlen(buf));
		if (copy_to_user(ubuf, buf, buflen)) {
		pr_err("Couldn't copy_to_user\n");
		retval = -EFAULT;
		@@ -1880,7 +1880,7 @@ static ssize_t iommu_debug_dma_map_read(struct file file, char __user ubuf,
		iova = ddev->iova;
		snprintf(buf, 100, "%pa\n", &iova);

		buflen = min(count, strlen(buf)+1);
		buflen = min(count, strlen(buf));
		if (copy_to_user(ubuf, buf, buflen)) {
		pr_err("Couldn't copy_to_user\n");
		retval = -EFAULT;