Skip to contentSkip to conversation

xen/privcmd: return -EFAULT on error

PATCH NAK Dan Carpenter 2 participants 3 messages Sep 8, 2012 – Sep 9, 2012

Subsystems (3)
Kernel janitors virtio core Xen hypervisor interface
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 2/3 xen/privcmd: return -EFAULT on error

__copy_to_user() returns the number of bytes remaining to be copied but we want to return a negative error code here.

Signed-off-by Dan Carpenter <[email protected]>
drivers/xen/privcmd.c +4 -1
index fdff8f9..0ce006a 100644
@@ -393,8 +393,11 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
 		state.err      = err_array;
 		ret = traverse_pages(m.num, sizeof(xen_pfn_t),
 				     &pagelist, mmap_return_errors_v1, &state);
-	} else if (version = 2)
+	} else if (version = 2) {
 		ret = __copy_to_user(m.err, err_array, m.num * sizeof(int));
+		if (ret)
+			ret = -EFAULT;
+	}
 
 	/* If we have not had any EFAULT-like global errors then set the global
 	 * error to -ENOENT if necessary. */
Acked-by on v1 2/3
#1 lore raw
Quoted 4 lines · Dan Carpenter

__copy_to_user() returns the number of bytes remaining to be copied but we want to return a negative error code here.

Signed-off-by Dan Carpenter <[email protected]>
Acked-by Andres Lagar-Cavilla <[email protected]>
Quoted 18 lines
drivers/xen/privcmd.c +4 -1
index fdff8f9..0ce006a 100644
@@ -393,8 +393,11 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
 		state.err      = err_array;
 		ret = traverse_pages(m.num, sizeof(xen_pfn_t),
 				     &pagelist, mmap_return_errors_v1, &state);
-	} else if (version = 2)
+	} else if (version = 2) {
 		ret = __copy_to_user(m.err, err_array, m.num * sizeof(int));
+		if (ret)
+			ret = -EFAULT;
+	}
 
 	/* If we have not had any EFAULT-like global errors then set the global
 	 * error to -ENOENT if necessary. */
Acked-by on v1 2/3
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · Dan Carpenter

__copy_to_user() returns the number of bytes remaining to be copied but we want to return a negative error code here.

Signed-off-by Dan Carpenter <[email protected]>
Acked-by Andres Lagar-Cavilla <[email protected]>
Quoted 18 lines
drivers/xen/privcmd.c +4 -1
index fdff8f9..0ce006a 100644
@@ -393,8 +393,11 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
 		state.err      = err_array;
 		ret = traverse_pages(m.num, sizeof(xen_pfn_t),
 				     &pagelist, mmap_return_errors_v1, &state);
-	} else if (version == 2)
+	} else if (version == 2) {
 		ret = __copy_to_user(m.err, err_array, m.num * sizeof(int));
+		if (ret)
+			ret = -EFAULT;
+	}
 
 	/* If we have not had any EFAULT-like global errors then set the global
 	 * error to -ENOENT if necessary. */