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

drivers/iommu/iommu-debug.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1395,7 +1395,7 @@ static ssize_t iommu_debug_test_virt_addr_read(struct file *file,
		else
		snprintf(buf, buf_len, "0x%pK\n", test_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;
		@@ -1518,7 +1518,7 @@ static ssize_t iommu_debug_pte_read(struct file file, char __user ubuf,
		else
		snprintf(buf, sizeof(buf), "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;
		@@ -1587,7 +1587,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;
		@@ -1640,7 +1640,7 @@ static ssize_t iommu_debug_dma_atos_read(struct file file, char __user ubuf,
		else
		snprintf(buf, sizeof(buf), "%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;
		@@ -1873,7 +1873,7 @@ static ssize_t iommu_debug_dma_map_read(struct file file, char __user ubuf,
		iova = ddev->iova;
		snprintf(buf, sizeof(buf), "%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;