From: Andi Kleen <ak@suse.de>
Date: Wed, 2 May 2007 17:27:21 +0000 (+0200)
Subject: [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
X-Git-Tag: v2.6.22-rc1~1011^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a106009bdfa12b6452b724cc0718ca8e1334745d;p=linux-2.6-omap-h63xx.git

[PATCH] x86-64: Print type and size correctly for unknown compat ioctls

Signed-off-by: Andi Kleen <ak@suse.de>
---

diff --git a/fs/compat.c b/fs/compat.c
index 040a8be38a4..72e5e692382 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -371,13 +371,14 @@ static void compat_ioctl_error(struct file *filp, unsigned int fd,
 			fn = "?";
 	}
 
-	sprintf(buf,"'%c'", (cmd>>24) & 0x3f);
+	sprintf(buf,"'%c'", (cmd>>_IOC_TYPESHIFT) & _IOC_TYPEMASK);
 	if (!isprint(buf[1]))
 		sprintf(buf, "%02x", buf[1]);
 	compat_printk("ioctl32(%s:%d): Unknown cmd fd(%d) "
-			"cmd(%08x){%s} arg(%08x) on %s\n",
+			"cmd(%08x){t:%s;sz:%u} arg(%08x) on %s\n",
 			current->comm, current->pid,
 			(int)fd, (unsigned int)cmd, buf,
+			(cmd >> _IOC_SIZESHIFT) & _IOC_SIZEMASK,
 			(unsigned int)arg, fn);
 
 	if (path)