lp: fix sparc64 LPSETTIMEOUT ioctl

commit 45a2d64696b11913bcf1087b041740edbade3e21 upstream.

The layout of struct timeval is different on sparc64 from
anything else, and the patch I did long ago failed to take
this into account.

Change it now to handle sparc64 user space correctly again.

Quite likely nobody cares about parallel ports on sparc64,
but there is no reason not to fix it.

Cc: stable@vger.kernel.org
Fixes: 9a450484089d ("lp: support 64-bit time_t user space")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20191108203435.112759-7-arnd@arndb.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 8c4dd1a3bb6ab562136e32bad330fd1da2fdb1c5..767740d758dd6f916a99719ad447a1fb806db763 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -708,6 +708,10 @@ static int lp_set_timeout64(unsigned int minor, void __user *arg)
        if (copy_from_user(karg, arg, sizeof(karg)))
                return -EFAULT;
 
+       /* sparc64 suseconds_t is 32-bit only */
+       if (IS_ENABLED(CONFIG_SPARC64) && !in_compat_syscall())
+               karg[1] >>= 32;
+
        return lp_set_timeout(minor, karg[0], karg[1]);
 }