dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

init: mark __user address space on string literals 

When calling syscall service routines in kernel, some of arguments should
be user pointers but were missing __user markup on string literals.  Add
it.  Removes some sparse warnings.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Namhyung Kim 2010-10-26 14:22:42 -07:00 committed by Linus Torvalds
parent f0cfec1118
commit 562f5e638d
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/do_mounts.c
View File

@ -291,7 +291,7 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
if (err) if (err)
return err; return err;
sys_chdir("/root"); sys_chdir((const char __user __force *)"/root");
ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev; ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n", printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
current->fs->pwd.mnt->mnt_sb->s_type->name, current->fs->pwd.mnt->mnt_sb->s_type->name,
@ -488,5 +488,5 @@ void __init prepare_namespace(void)
out: out:
devtmpfs_mount("dev"); devtmpfs_mount("dev");
sys_mount(".", "/", NULL, MS_MOVE, NULL); sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot("."); sys_chroot((const char __user __force *)".");
} }

2
init/do_mounts_md.c
View File

@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
wait_for_device_probe(); wait_for_device_probe();
fd = sys_open("/dev/md0", 0, 0); fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
if (fd >= 0) { if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd); sys_close(fd);

4
init/do_mounts_rd.c
View File

@ -168,7 +168,7 @@ int __init rd_load_image(char *from)
char rotator[4] = { '|' , '/' , '-' , '\\' }; char rotator[4] = { '|' , '/' , '-' , '\\' };
#endif #endif
out_fd = sys_open("/dev/ram", O_RDWR, 0); out_fd = sys_open((const char __user __force *) "/dev/ram", O_RDWR, 0);
if (out_fd < 0) if (out_fd < 0)
goto out; goto out;
@ -267,7 +267,7 @@ noclose_input:
sys_close(out_fd); sys_close(out_fd);
out: out:
kfree(buf); kfree(buf);
sys_unlink("/dev/ram"); sys_unlink((const char __user __force *) "/dev/ram");
return res; return res;
} }

5
init/initramfs.c
View File

@ -528,7 +528,7 @@ static void __init clean_rootfs(void)
struct linux_dirent64 *dirp; struct linux_dirent64 *dirp;
int num; int num;
fd = sys_open("/", O_RDONLY, 0); fd = sys_open((const char __user __force *) "/", O_RDONLY, 0);
WARN_ON(fd < 0); WARN_ON(fd < 0);
if (fd < 0) if (fd < 0)
return; return;
@ -590,7 +590,8 @@ static int __init populate_rootfs(void)
} }
printk(KERN_INFO "rootfs image is not initramfs (%s)" printk(KERN_INFO "rootfs image is not initramfs (%s)"
"; looks like an initrd\n", err); "; looks like an initrd\n", err);
fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700); fd = sys_open((const char __user __force *) "/initrd.image",
O_WRONLY|O_CREAT, 0700);
if (fd >= 0) { if (fd >= 0) {
sys_write(fd, (char *)initrd_start, sys_write(fd, (char *)initrd_start,
initrd_end - initrd_start); initrd_end - initrd_start);

6
init/noinitramfs.c
View File

@ -29,17 +29,17 @@ static int __init default_rootfs(void)
{ {
int err; int err;
err = sys_mkdir("/dev", 0755); err = sys_mkdir((const char __user __force *) "/dev", 0755);
if (err < 0) if (err < 0)
goto out; goto out;
err = sys_mknod((const char __user *) "/dev/console", err = sys_mknod((const char __user __force *) "/dev/console",
S_IFCHR | S_IRUSR | S_IWUSR, S_IFCHR | S_IRUSR | S_IWUSR,
new_encode_dev(MKDEV(5, 1))); new_encode_dev(MKDEV(5, 1)));
if (err < 0) if (err < 0)
goto out; goto out;
err = sys_mkdir("/root", 0700); err = sys_mkdir((const char __user __force *) "/root", 0700);
if (err < 0) if (err < 0)
goto out; goto out;