From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 26 Jul 2007 16:35:59 +0000 (+0100)
Subject: xfs ioctl __user annotations
X-Git-Tag: v2.6.23-rc2~238
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad690ef9e690f6c31f7d310b09ef1314bcec9033;p=linux-2.6

xfs ioctl __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
index 141cf15067..42319d75aa 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
@@ -139,7 +139,7 @@ STATIC int xfs_inumbers_fmt_compat(
 	long count,
 	long *written)
 {
-	compat_xfs_inogrp_t *p32 = ubuffer;
+	compat_xfs_inogrp_t __user *p32 = ubuffer;
 	long i;
 
 	for (i = 0; i < count; i++) {
@@ -444,7 +444,7 @@ xfs_compat_ioctl(
 	case XFS_IOC_FSINUMBERS_32:
 		cmd = _NATIVE_IOC(cmd, struct xfs_fsop_bulkreq);
 		return xfs_ioc_bulkstat_compat(XFS_BHVTOI(VNHEAD(vp))->i_mount,
-				cmd, (void*)arg);
+				cmd, (void __user*)arg);
 	case XFS_IOC_FD_TO_HANDLE_32:
 	case XFS_IOC_PATH_TO_HANDLE_32:
 	case XFS_IOC_PATH_TO_FSHANDLE_32: