From 1eaa7f24217510d047a9bfafc7b26463cd24c502 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@home.transmeta.com>
Date: Tue, 8 Apr 2003 08:31:48 -0700
Subject: [PATCH] Annotate fs/namei.c with user pointer annotations.
---
fs/namei.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 40809cb8d84a..5f4e5a56f1e9 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -108,7 +108,7 @@
* POSIX.1 2.4: an empty pathname is invalid (ENOENT).
* PATH_MAX includes the nul terminator --RR.
*/
-static inline int do_getname(const char *filename, char *page)
+static inline int do_getname(const char __user *filename, char *page)
{
int retval;
unsigned long len = PATH_MAX;
@@ -129,7 +129,7 @@ static inline int do_getname(const char *filename, char *page)
return retval;
}
-char * getname(const char * filename)
+char * getname(const char __user * filename)
{
char *tmp, *result;
@@ -941,7 +941,7 @@ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
* that namei follows links, while lnamei does not.
* SMP-safe
*/
-int __user_walk(const char *name, unsigned flags, struct nameidata *nd)
+int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
{
char *tmp = getname(name);
int err = PTR_ERR(tmp);
@@ -1402,7 +1402,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
return error;
}
-asmlinkage long sys_mknod(const char * filename, int mode, dev_t dev)
+asmlinkage long sys_mknod(const char __user * filename, int mode, dev_t dev)
{
int error = 0;
char * tmp;
@@ -1471,7 +1471,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
return error;
}
-asmlinkage long sys_mkdir(const char * pathname, int mode)
+asmlinkage long sys_mkdir(const char __user * pathname, int mode)
{
int error = 0;
char * tmp;
@@ -1568,7 +1568,7 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry)
return error;
}
-asmlinkage long sys_rmdir(const char * pathname)
+asmlinkage long sys_rmdir(const char __user * pathname)
{
int error = 0;
char * name;
@@ -1643,7 +1643,7 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
* writeout happening, and we don't want to prevent access to the directory
* while waiting on the I/O.
*/
-asmlinkage long sys_unlink(const char * pathname)
+asmlinkage long sys_unlink(const char __user * pathname)
{
int error = 0;
char * name;
@@ -1714,7 +1714,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)
return error;
}
-asmlinkage long sys_symlink(const char * oldname, const char * newname)
+asmlinkage long sys_symlink(const char __user * oldname, const char __user * newname)
{
int error = 0;
char * from;
@@ -1796,7 +1796,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
* with linux 2.0, and to avoid hard-linking to directories
* and other special files. --ADM
*/
-asmlinkage long sys_link(const char * oldname, const char * newname)
+asmlinkage long sys_link(const char __user * oldname, const char __user * newname)
{
struct dentry *new_dentry;
struct nameidata nd, old_nd;
@@ -2057,7 +2057,7 @@ static inline int do_rename(const char * oldname, const char * newname)
return error;
}
-asmlinkage long sys_rename(const char * oldname, const char * newname)
+asmlinkage long sys_rename(const char __user * oldname, const char __user * newname)
{
int error;
char * from;
@@ -2076,7 +2076,7 @@ asmlinkage long sys_rename(const char * oldname, const char * newname)
return error;
}
-int vfs_readlink(struct dentry *dentry, char *buffer, int buflen, const char *link)
+int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
{
int len;
@@ -2157,7 +2157,7 @@ static char *page_getlink(struct dentry * dentry, struct page **ppage)
return (char*)page;
}
-int page_readlink(struct dentry *dentry, char *buffer, int buflen)
+int page_readlink(struct dentry *dentry, char __user *buffer, int buflen)
{
struct page *page = NULL;
char *s = page_getlink(dentry, &page);
--
2.30.9