Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 1b18d74..f690310 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -8,6 +8,7 @@
 #include <linux/syscalls.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
+#include <linux/capability.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/security.h>
@@ -163,7 +164,7 @@ int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, unsigned lon
                        /* fixme: if stealth, return -ENOTTY */
                        error = -EPERM;
                        if (capable(CAP_CONTEXT))
-                               error = put_user(inode->i_xid, (int *) arg);
+                               error = put_user(inode->i_xid, (int __user *) arg);
                        break;
                }
                case FIOC_SETXID: {
@@ -181,7 +182,7 @@ int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, unsigned lon
                        if (!(inode->i_sb->s_flags & MS_TAGXID))
                                break;
                        error = -EFAULT;
-                       if (get_user(xid, (int *) arg))
+                       if (get_user(xid, (int __user *) arg))
                                break;
                        error = 0;
                        inode->i_xid = (xid & 0xFFFF);