linux-kernel - [PATCH 08/30] compat: Use COMPAT_USE_64BIT

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 19 Feb 2012 16:07:46 -0800
From:	"H. Peter Anvin" <hpa@...or.com>
To:	linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org
Cc:	mingo@...nel.org, tglx@...utronix.de, hpa@...or.com,
	torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
	hjl.tools@...il.com, Arnd Bergmann <arnd@...db.de>,
	Greg Kroah-Hartman <greg@...ah.com>
Subject: [PATCH 08/30] compat: Use COMPAT_USE_64BIT_TIME in the lp driver

From: "H. J. Lu" <hjl.tools@...il.com>

Enable the lp driver to be used with a compat ABI with 64-bit time.

Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Greg Kroah-Hartman <greg@...ah.com>
---
 drivers/char/lp.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index f434856..a111ff2 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -706,18 +706,26 @@ static long lp_compat_ioctl(struct file *file, unsigned int cmd,
 {
 	unsigned int minor;
 	struct timeval par_timeout;
-	struct compat_timeval __user *tc;
 	int ret;
 
 	minor = iminor(file->f_path.dentry->d_inode);
 	mutex_lock(&lp_mutex);
 	switch (cmd) {
 	case LPSETTIMEOUT:
-		tc = compat_ptr(arg);
-		if (get_user(par_timeout.tv_sec, &tc->tv_sec) ||
-		    get_user(par_timeout.tv_usec, &tc->tv_usec)) {
-			ret = -EFAULT;
-			break;
+		if (COMPAT_USE_64BIT_TIME) {
+			if (copy_from_user(&par_timeout, (void __user *)arg,
+						sizeof (struct timeval))) {
+				ret = -EFAULT;
+				break;
+			}
+		} else {
+			struct compat_timeval __user *tc;
+			tc = compat_ptr(arg);
+			if (get_user(par_timeout.tv_sec, &tc->tv_sec) ||
+			    get_user(par_timeout.tv_usec, &tc->tv_usec)) {
+				ret = -EFAULT;
+				break;
+			}
 		}
 		ret = lp_set_timeout(minor, &par_timeout);
 		break;
-- 
1.7.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/