lp: fix sparc64 LPSETTIMEOUT ioctl

BugLink: https://bugs.launchpad.net/bugs/1856334
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>
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 7c9269e3477a448d72a6758b73bda61c3506d0e7..bd95aba1f9fe8eb9768b87a8a7fc602ee5adef8d 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -713,6 +713,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]);
 }