Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 489f9510 authored by Vijayanand Jitta's avatar Vijayanand Jitta
Browse files

iommu: iommu-debug: don't pass null character to copy_to_user 



Doing a cat on pte,test_virt_addr from adb shell prints a null
character as well which is at the end of the string this is not
required so, don't pass this null character to copy_to_user.

Change-Id: I8d9120f64d1df84a704379eb00bd239fc7059e9e
Signed-off-by: default avatarVijayanand Jitta <vjitta@codeaurora.org>
parent 71f1e4e5

drivers/iommu/iommu-debug.c

+5 −5
Original line number Diff line number Diff line
@@ -1495,7 +1495,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_ratelimited("Couldn't copy_to_user\n");

		retval = -EFAULT;
@@ -1624,7 +1624,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_ratelimited("Couldn't copy_to_user\n");

		retval = -EFAULT;
@@ -1698,7 +1698,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_ratelimited("Couldn't copy_to_user\n");

		retval = -EFAULT;
@@ -1757,7 +1757,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_ratelimited("Couldn't copy_to_user\n");

		retval = -EFAULT;
@@ -1999,7 +1999,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_ratelimited("Couldn't copy_to_user\n");

		retval = -EFAULT;