Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

kernel: Commit

kernel


Commit MetaInfo

Revisióne07fb66a09fe81ef3e0f4cb2dcbff46175618462 (tree)
Tiempo2019-09-21 14:14:22
AutorJann Horn <jannh@goog...>
CommiterGreg Kroah-Hartman

Log Message

floppy: fix usercopy direction

commit 52f6f9d74f31078964ca1574f7bb612da7877ac8 upstream.

As sparse points out, these two copy_from_user() should actually be
copy_to_user().

Fixes: 229b53c9bf4e ("take floppy compat ioctls to sodding floppy.c")
Cc: stable@vger.kernel.org
Acked-by: Alexander Popov <alex.popov@linux.com>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Cambiar Resumen

Diferencia incremental

--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3784,7 +3784,7 @@ static int compat_getdrvprm(int drive,
37843784 v.native_format = UDP->native_format;
37853785 mutex_unlock(&floppy_mutex);
37863786
3787- if (copy_from_user(arg, &v, sizeof(struct compat_floppy_drive_params)))
3787+ if (copy_to_user(arg, &v, sizeof(struct compat_floppy_drive_params)))
37883788 return -EFAULT;
37893789 return 0;
37903790 }
@@ -3820,7 +3820,7 @@ static int compat_getdrvstat(int drive, bool poll,
38203820 v.bufblocks = UDRS->bufblocks;
38213821 mutex_unlock(&floppy_mutex);
38223822
3823- if (copy_from_user(arg, &v, sizeof(struct compat_floppy_drive_struct)))
3823+ if (copy_to_user(arg, &v, sizeof(struct compat_floppy_drive_struct)))
38243824 return -EFAULT;
38253825 return 0;
38263826 Eintr:
Show on old repository browser