| Message ID | 1487005404-3183-2-git-send-email-paul.durrant@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/13/2017 12:03 PM, Paul Durrant wrote: > The code sets the default return code to -ENOSYS but then overrides this > to -EINVAL in the switch() statement's default case, which is clearly > silly. > > This patch removes the override and sets the default return code to > -ENOTTY, which is the conventional return for an unimplemented ioctl. > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Applied to for-linus-4.11. -boris
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 6e3306f..5e5c7ae 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -551,7 +551,7 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version) static long privcmd_ioctl(struct file *file, unsigned int cmd, unsigned long data) { - int ret = -ENOSYS; + int ret = -ENOTTY; void __user *udata = (void __user *) data; switch (cmd) { @@ -572,7 +572,6 @@ static long privcmd_ioctl(struct file *file, break; default: - ret = -EINVAL; break; }
The code sets the default return code to -ENOSYS but then overrides this to -EINVAL in the switch() statement's default case, which is clearly silly. This patch removes the override and sets the default return code to -ENOTTY, which is the conventional return for an unimplemented ioctl. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> --- Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> v2: - Use -ENOTTY rather than -ENOSYS --- drivers/xen/privcmd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)