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

vfs: define struct filename and have getname() return it 

getname() is intended to copy pathname strings from userspace into a
kernel buffer. The result is just a string in kernel space. It would
however be quite helpful to be able to attach some ancillary info to
the string.

For instance, we could attach some audit-related info to reduce the
amount of audit-related processing needed. When auditing is enabled,
we could also call getname() on the string more than once and not
need to recopy it from userspace.

This patchset converts the getname()/putname() interfaces to return
a struct instead of a string. For now, the struct just tracks the
string in kernel space and the original userland pointer for it.

Later, we'll add other information to the struct as it becomes
convenient.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Jeff Layton 2012-10-10 15:25:28 -04:00 committed by Al Viro
parent 8e377d1507
commit 91a27b2a75
40 changed files with 218 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/alpha/kernel/osf_sys.c
View File

@ -449,7 +449,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
{ {
int retval; int retval;
struct cdfs_args tmp; struct cdfs_args tmp;
char *devname; struct filename *devname;
retval = -EFAULT; retval = -EFAULT;
if (copy_from_user(&tmp, args, sizeof(tmp))) if (copy_from_user(&tmp, args, sizeof(tmp)))
@ -458,7 +458,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
retval = PTR_ERR(devname); retval = PTR_ERR(devname);
if (IS_ERR(devname)) if (IS_ERR(devname))
goto out; goto out;
retval = do_mount(devname, dirname, "ext2", flags, NULL); retval = do_mount(devname->name, dirname, "ext2", flags, NULL);
putname(devname); putname(devname);
out: out:
return retval; return retval;
@ -469,7 +469,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
{ {
int retval; int retval;
struct cdfs_args tmp; struct cdfs_args tmp;
char *devname; struct filename *devname;
retval = -EFAULT; retval = -EFAULT;
if (copy_from_user(&tmp, args, sizeof(tmp))) if (copy_from_user(&tmp, args, sizeof(tmp)))
@ -478,7 +478,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
retval = PTR_ERR(devname); retval = PTR_ERR(devname);
if (IS_ERR(devname)) if (IS_ERR(devname))
goto out; goto out;
retval = do_mount(devname, dirname, "iso9660", flags, NULL); retval = do_mount(devname->name, dirname, "iso9660", flags, NULL);
putname(devname); putname(devname);
out: out:
return retval; return retval;
@ -499,7 +499,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
int, flag, void __user *, data) int, flag, void __user *, data)
{ {
int retval; int retval;
char *name; struct filename *name;
name = getname(path); name = getname(path);
retval = PTR_ERR(name); retval = PTR_ERR(name);
@ -507,13 +507,13 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
goto out; goto out;
switch (typenr) { switch (typenr) {
case 1: case 1:
retval = osf_ufs_mount(name, data, flag); retval = osf_ufs_mount(name->name, data, flag);
break; break;
case 6: case 6:
retval = osf_cdfs_mount(name, data, flag); retval = osf_cdfs_mount(name->name, data, flag);
break; break;
case 9: case 9:
retval = osf_procfs_mount(name, data, flag); retval = osf_procfs_mount(name->name, data, flag);
break; break;
default: default:
retval = -EINVAL; retval = -EINVAL;

4
arch/arm64/kernel/sys.c
View File

@ -50,13 +50,13 @@ asmlinkage long sys_execve(const char __user *filenamei,
struct pt_regs *regs) struct pt_regs *regs)
{ {
long error; long error;
char * filename; struct filename *filename;
filename = getname(filenamei); filename = getname(filenamei);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
out: out:
return error; return error;

6
arch/arm64/kernel/sys_compat.c
View File

@ -56,14 +56,14 @@ asmlinkage int compat_sys_execve(const char __user *filenamei,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char * filename; struct filename *filename;
filename = getname(filenamei); filename = getname(filenamei);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = compat_do_execve(filename, compat_ptr(argv), compat_ptr(envp), error = compat_do_execve(filename->name, compat_ptr(argv),
regs); compat_ptr(envp), regs);
putname(filename); putname(filename);
out: out:
return error; return error;

4
arch/avr32/kernel/process.c
View File

@ -388,14 +388,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname(ufilename); filename = getname(ufilename);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, uargv, uenvp, regs); error = do_execve(filename->name, uargv, uenvp, regs);
putname(filename); putname(filename);
out: out:

4
arch/blackfin/kernel/process.c
View File

@ -213,14 +213,14 @@ asmlinkage int sys_execve(const char __user *name,
const char __user *const __user *envp) const char __user *const __user *envp)
{ {
int error; int error;
char *filename; struct filename *filename;
struct pt_regs *regs = (struct pt_regs *)((&name) + 6); struct pt_regs *regs = (struct pt_regs *)((&name) + 6);
filename = getname(name); filename = getname(name);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
return error; return error;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
return error; return error;
} }

4
arch/cris/arch-v10/kernel/process.c
View File

@ -212,14 +212,14 @@ asmlinkage int sys_execve(const char *fname,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname(fname); filename = getname(fname);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
out: out:
return error; return error;

4
arch/cris/arch-v32/kernel/process.c
View File

@ -224,7 +224,7 @@ sys_execve(const char *fname,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname(fname); filename = getname(fname);
error = PTR_ERR(filename); error = PTR_ERR(filename);
@ -232,7 +232,7 @@ sys_execve(const char *fname,
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
out: out:
return error; return error;

4
arch/h8300/kernel/process.c
View File

@ -217,14 +217,14 @@ asmlinkage int sys_execve(const char *name,
int dummy, ...) int dummy, ...)
{ {
int error; int error;
char * filename; struct filename *filename;
struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4); struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4);
filename = getname(name); filename = getname(name);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
return error; return error;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
return error; return error;
} }

4
arch/hexagon/kernel/syscall.c
View File

@ -40,7 +40,7 @@ asmlinkage int sys_execve(char __user *ufilename,
const char __user *const __user *envp) const char __user *const __user *envp)
{ {
struct pt_regs *pregs = current_thread_info()->regs; struct pt_regs *pregs = current_thread_info()->regs;
char *filename; struct filename *filename;
int retval; int retval;
filename = getname(ufilename); filename = getname(ufilename);
@ -48,7 +48,7 @@ asmlinkage int sys_execve(char __user *ufilename,
if (IS_ERR(filename)) if (IS_ERR(filename))
return retval; return retval;
retval = do_execve(filename, argv, envp, pregs); retval = do_execve(filename->name, argv, envp, pregs);
putname(filename); putname(filename);
return retval; return retval;

4
arch/ia64/kernel/process.c
View File

@ -614,14 +614,14 @@ sys_execve (const char __user *filename,
const char __user *const __user *envp, const char __user *const __user *envp,
struct pt_regs *regs) struct pt_regs *regs)
{ {
char *fname; struct filename *fname;
int error; int error;
fname = getname(filename); fname = getname(filename);
error = PTR_ERR(fname); error = PTR_ERR(fname);
if (IS_ERR(fname)) if (IS_ERR(fname))
goto out; goto out;
error = do_execve(fname, argv, envp, regs); error = do_execve(fname->name, argv, envp, regs);
putname(fname); putname(fname);
out: out:
return error; return error;

4
arch/m32r/kernel/process.c
View File

@ -296,14 +296,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
unsigned long r6, struct pt_regs regs) unsigned long r6, struct pt_regs regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname(ufilename); filename = getname(ufilename);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, uargv, uenvp, &regs); error = do_execve(filename->name, uargv, uenvp, &regs);
putname(filename); putname(filename);
out: out:
return error; return error;

4
arch/microblaze/kernel/sys_microblaze.c
View File

@ -54,13 +54,13 @@ asmlinkage long microblaze_execve(const char __user *filenamei,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname(filenamei); filename = getname(filenamei);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
out: out:
return error; return error;

4
arch/mips/kernel/linux32.c
View File

@ -83,13 +83,13 @@ out:
asmlinkage int sys32_execve(nabi_no_regargs struct pt_regs regs) asmlinkage int sys32_execve(nabi_no_regargs struct pt_regs regs)
{ {
int error; int error;
char * filename; struct filename *filename;
filename = getname(compat_ptr(regs.regs[4])); filename = getname(compat_ptr(regs.regs[4]));
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = compat_do_execve(filename, compat_ptr(regs.regs[5]), error = compat_do_execve(filename->name, compat_ptr(regs.regs[5]),
compat_ptr(regs.regs[6]), &regs); compat_ptr(regs.regs[6]), &regs);
putname(filename); putname(filename);

4
arch/mips/kernel/syscall.c
View File

@ -133,13 +133,13 @@ _sys_clone(nabi_no_regargs struct pt_regs regs)
asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs) asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs)
{ {
int error; int error;
char * filename; struct filename *filename;
filename = getname((const char __user *) (long)regs.regs[4]); filename = getname((const char __user *) (long)regs.regs[4]);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *) (long)regs.regs[5], (const char __user *const __user *) (long)regs.regs[5],
(const char __user *const __user *) (long)regs.regs[6], (const char __user *const __user *) (long)regs.regs[6],
&regs); &regs);

4
arch/openrisc/kernel/process.c
View File

@ -271,7 +271,7 @@ asmlinkage long _sys_execve(const char __user *name,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname(name); filename = getname(name);
error = PTR_ERR(filename); error = PTR_ERR(filename);
@ -279,7 +279,7 @@ asmlinkage long _sys_execve(const char __user *name,
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
out: out:

4
arch/parisc/hpux/fs.c
View File

@ -34,14 +34,14 @@
int hpux_execve(struct pt_regs *regs) int hpux_execve(struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname((const char __user *) regs->gr[26]); filename = getname((const char __user *) regs->gr[26]);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *) regs->gr[25], (const char __user *const __user *) regs->gr[25],
(const char __user *const __user *) regs->gr[24], (const char __user *const __user *) regs->gr[24],
regs); regs);

4
arch/parisc/kernel/process.c
View File

@ -342,13 +342,13 @@ unsigned long thread_saved_pc(struct task_struct *t)
asmlinkage int sys_execve(struct pt_regs *regs) asmlinkage int sys_execve(struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname((const char __user *) regs->gr[26]); filename = getname((const char __user *) regs->gr[26]);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *) regs->gr[25], (const char __user *const __user *) regs->gr[25],
(const char __user *const __user *) regs->gr[24], (const char __user *const __user *) regs->gr[24],
regs); regs);

4
arch/parisc/kernel/sys_parisc32.c
View File

@ -60,14 +60,14 @@
asmlinkage int sys32_execve(struct pt_regs *regs) asmlinkage int sys32_execve(struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
DBG(("sys32_execve(%p) r26 = 0x%lx\n", regs, regs->gr[26])); DBG(("sys32_execve(%p) r26 = 0x%lx\n", regs, regs->gr[26]));
filename = getname((const char __user *) regs->gr[26]); filename = getname((const char __user *) regs->gr[26]);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = compat_do_execve(filename, compat_ptr(regs->gr[25]), error = compat_do_execve(filename->name, compat_ptr(regs->gr[25]),
compat_ptr(regs->gr[24]), regs); compat_ptr(regs->gr[24]), regs);
putname(filename); putname(filename);
out: out:

4
arch/score/kernel/sys_score.c
View File

@ -92,14 +92,14 @@ asmlinkage long
score_execve(struct pt_regs *regs) score_execve(struct pt_regs *regs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname((char __user*)regs->regs[4]); filename = getname((char __user*)regs->regs[4]);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
return error; return error;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *)regs->regs[5], (const char __user *const __user *)regs->regs[5],
(const char __user *const __user *)regs->regs[6], (const char __user *const __user *)regs->regs[6],
regs); regs);

4
arch/sh/kernel/process_32.c
View File

@ -298,14 +298,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0); struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
int error; int error;
char *filename; struct filename *filename;
filename = getname(ufilename); filename = getname(ufilename);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, uargv, uenvp, regs); error = do_execve(filename->name, uargv, uenvp, regs);
putname(filename); putname(filename);
out: out:
return error; return error;

4
arch/sh/kernel/process_64.c
View File

@ -491,14 +491,14 @@ asmlinkage int sys_execve(const char *ufilename, char **uargv,
struct pt_regs *pregs) struct pt_regs *pregs)
{ {
int error; int error;
char *filename; struct filename *filename;
filename = getname((char __user *)ufilename); filename = getname((char __user *)ufilename);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *)uargv, (const char __user *const __user *)uargv,
(const char __user *const __user *)uenvp, (const char __user *const __user *)uenvp,
pregs); pregs);

4
arch/sparc/kernel/process_32.c
View File

@ -482,7 +482,7 @@ int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs)
asmlinkage int sparc_execve(struct pt_regs *regs) asmlinkage int sparc_execve(struct pt_regs *regs)
{ {
int error, base = 0; int error, base = 0;
char *filename; struct filename *filename;
/* Check for indirect call. */ /* Check for indirect call. */
if(regs->u_regs[UREG_G1] == 0) if(regs->u_regs[UREG_G1] == 0)
@ -492,7 +492,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
error = PTR_ERR(filename); error = PTR_ERR(filename);
if(IS_ERR(filename)) if(IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *) (const char __user *const __user *)
regs->u_regs[base + UREG_I1], regs->u_regs[base + UREG_I1],
(const char __user *const __user *) (const char __user *const __user *)

4
arch/sparc/kernel/process_64.c
View File

@ -722,7 +722,7 @@ EXPORT_SYMBOL(dump_fpu);
asmlinkage int sparc_execve(struct pt_regs *regs) asmlinkage int sparc_execve(struct pt_regs *regs)
{ {
int error, base = 0; int error, base = 0;
char *filename; struct filename *filename;
/* User register window flush is done by entry.S */ /* User register window flush is done by entry.S */
@ -734,7 +734,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, error = do_execve(filename->name,
(const char __user *const __user *) (const char __user *const __user *)
regs->u_regs[base + UREG_I1], regs->u_regs[base + UREG_I1],
(const char __user *const __user *) (const char __user *const __user *)

4
arch/sparc/kernel/sys_sparc32.c
View File

@ -403,7 +403,7 @@ asmlinkage long compat_sys_rt_sigaction(int sig,
asmlinkage long sparc32_execve(struct pt_regs *regs) asmlinkage long sparc32_execve(struct pt_regs *regs)
{ {
int error, base = 0; int error, base = 0;
char *filename; struct filename *filename;
/* User register window flush is done by entry.S */ /* User register window flush is done by entry.S */
@ -416,7 +416,7 @@ asmlinkage long sparc32_execve(struct pt_regs *regs)
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = compat_do_execve(filename, error = compat_do_execve(filename->name,
compat_ptr(regs->u_regs[base + UREG_I1]), compat_ptr(regs->u_regs[base + UREG_I1]),
compat_ptr(regs->u_regs[base + UREG_I2]), regs); compat_ptr(regs->u_regs[base + UREG_I2]), regs);

8
arch/tile/kernel/process.c
View File

@ -594,13 +594,13 @@ SYSCALL_DEFINE4(execve, const char __user *, path,
struct pt_regs *, regs) struct pt_regs *, regs)
{ {
long error; long error;
char *filename; struct filename *filename;
filename = getname(path); filename = getname(path);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
if (error == 0) if (error == 0)
single_step_execve(); single_step_execve();
@ -615,13 +615,13 @@ long compat_sys_execve(const char __user *path,
struct pt_regs *regs) struct pt_regs *regs)
{ {
long error; long error;
char *filename; struct filename *filename;
filename = getname(path); filename = getname(path);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = compat_do_execve(filename, argv, envp, regs); error = compat_do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
if (error == 0) if (error == 0)
single_step_execve(); single_step_execve();

4
arch/unicore32/kernel/sys.c
View File

@ -51,13 +51,13 @@ asmlinkage long __sys_execve(const char __user *filename,
struct pt_regs *regs) struct pt_regs *regs)
{ {
int error; int error;
char *fn; struct filename *fn;
fn = getname(filename); fn = getname(filename);
error = PTR_ERR(fn); error = PTR_ERR(fn);
if (IS_ERR(fn)) if (IS_ERR(fn))
goto out; goto out;
error = do_execve(fn, argv, envp, regs); error = do_execve(fn->name, argv, envp, regs);
putname(fn); putname(fn);
out: out:
return error; return error;

4
arch/xtensa/kernel/process.c
View File

@ -328,13 +328,13 @@ long xtensa_execve(const char __user *name,
struct pt_regs *regs) struct pt_regs *regs)
{ {
long error; long error;
char * filename; struct filename *filename;
filename = getname(name); filename = getname(name);
error = PTR_ERR(filename); error = PTR_ERR(filename);
if (IS_ERR(filename)) if (IS_ERR(filename))
goto out; goto out;
error = do_execve(filename, argv, envp, regs); error = do_execve(filename->name, argv, envp, regs);
putname(filename); putname(filename);
out: out:
return error; return error;

12
fs/compat.c
View File

@ -776,16 +776,16 @@ asmlinkage long compat_sys_mount(const char __user * dev_name,
char *kernel_type; char *kernel_type;
unsigned long data_page; unsigned long data_page;
char *kernel_dev; char *kernel_dev;
char *dir_page; struct filename *dir;
int retval; int retval;
retval = copy_mount_string(type, &kernel_type); retval = copy_mount_string(type, &kernel_type);
if (retval < 0) if (retval < 0)
goto out; goto out;
dir_page = getname(dir_name); dir = getname(dir_name);
retval = PTR_ERR(dir_page); retval = PTR_ERR(dir);
if (IS_ERR(dir_page)) if (IS_ERR(dir))
goto out1; goto out1;
retval = copy_mount_string(dev_name, &kernel_dev); retval = copy_mount_string(dev_name, &kernel_dev);
@ -807,7 +807,7 @@ asmlinkage long compat_sys_mount(const char __user * dev_name,
} }
} }
retval = do_mount(kernel_dev, dir_page, kernel_type, retval = do_mount(kernel_dev, dir->name, kernel_type,
flags, (void*)data_page); flags, (void*)data_page);
out4: out4:
@ -815,7 +815,7 @@ asmlinkage long compat_sys_mount(const char __user * dev_name,
out3: out3:
kfree(kernel_dev); kfree(kernel_dev);
out2: out2:
putname(dir_page); putname(dir);
out1: out1:
kfree(kernel_type); kfree(kernel_type);
out: out:

13
fs/exec.c
View File

@ -105,7 +105,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt)
SYSCALL_DEFINE1(uselib, const char __user *, library) SYSCALL_DEFINE1(uselib, const char __user *, library)
{ {
struct file *file; struct file *file;
char *tmp = getname(library); struct filename *tmp = getname(library);
int error = PTR_ERR(tmp); int error = PTR_ERR(tmp);
static const struct open_flags uselib_flags = { static const struct open_flags uselib_flags = {
.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC, .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
@ -116,7 +116,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
if (IS_ERR(tmp)) if (IS_ERR(tmp))
goto out; goto out;
file = do_filp_open(AT_FDCWD, tmp, &uselib_flags, LOOKUP_FOLLOW); file = do_filp_open(AT_FDCWD, tmp->name, &uselib_flags, LOOKUP_FOLLOW);
putname(tmp); putname(tmp);
error = PTR_ERR(file); error = PTR_ERR(file);
if (IS_ERR(file)) if (IS_ERR(file))
@ -1664,10 +1664,10 @@ SYSCALL_DEFINE3(execve,
const char __user *const __user *, argv, const char __user *const __user *, argv,
const char __user *const __user *, envp) const char __user *const __user *, envp)
{ {
const char *path = getname(filename); struct filename *path = getname(filename);
int error = PTR_ERR(path); int error = PTR_ERR(path);
if (!IS_ERR(path)) { if (!IS_ERR(path)) {
error = do_execve(path, argv, envp, current_pt_regs()); error = do_execve(path->name, argv, envp, current_pt_regs());
putname(path); putname(path);
} }
return error; return error;
@ -1677,10 +1677,11 @@ asmlinkage long compat_sys_execve(const char __user * filename,
const compat_uptr_t __user * argv, const compat_uptr_t __user * argv,
const compat_uptr_t __user * envp) const compat_uptr_t __user * envp)
{ {
const char *path = getname(filename); struct filename *path = getname(filename);
int error = PTR_ERR(path); int error = PTR_ERR(path);
if (!IS_ERR(path)) { if (!IS_ERR(path)) {
error = compat_do_execve(path, argv, envp, current_pt_regs()); error = compat_do_execve(path->name, argv, envp,
current_pt_regs());
putname(path); putname(path);
} }
return error; return error;

4
fs/filesystems.c
View File

@ -124,7 +124,7 @@ EXPORT_SYMBOL(unregister_filesystem);
static int fs_index(const char __user * __name) static int fs_index(const char __user * __name)
{ {
struct file_system_type * tmp; struct file_system_type * tmp;
char * name; struct filename *name;
int err, index; int err, index;
name = getname(__name); name = getname(__name);
@ -135,7 +135,7 @@ static int fs_index(const char __user * __name)
err = -EINVAL; err = -EINVAL;
read_lock(&file_systems_lock); read_lock(&file_systems_lock);
for (tmp=file_systems, index=0 ; tmp ; tmp=tmp->next, index++) { for (tmp=file_systems, index=0 ; tmp ; tmp=tmp->next, index++) {
if (strcmp(tmp->name,name) == 0) { if (strcmp(tmp->name, name->name) == 0) {
err = index; err = index;
break; break;
} }

108
fs/namei.c
View File

@ -117,18 +117,37 @@
* POSIX.1 2.4: an empty pathname is invalid (ENOENT). * POSIX.1 2.4: an empty pathname is invalid (ENOENT).
* PATH_MAX includes the nul terminator --RR. * PATH_MAX includes the nul terminator --RR.
*/ */
static char *getname_flags(const char __user *filename, int flags, int *empty) void final_putname(struct filename *name)
{ {
char *result = __getname(), *err; __putname(name->name);
kfree(name);
}
static struct filename *
getname_flags(const char __user *filename, int flags, int *empty)
{
struct filename *result, *err;
char *kname;
int len; int len;
/* FIXME: create dedicated slabcache? */
result = kzalloc(sizeof(*result), GFP_KERNEL);
if (unlikely(!result)) if (unlikely(!result))
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
len = strncpy_from_user(result, filename, PATH_MAX); kname = __getname();
err = ERR_PTR(len); if (unlikely(!kname)) {
if (unlikely(len < 0)) err = ERR_PTR(-ENOMEM);
goto error_free_name;
}
result->name = kname;
result->uptr = filename;
len = strncpy_from_user(kname, filename, PATH_MAX);
if (unlikely(len < 0)) {
err = ERR_PTR(len);
goto error; goto error;
}
/* The empty path is special. */ /* The empty path is special. */
if (unlikely(!len)) { if (unlikely(!len)) {
@ -146,22 +165,25 @@ static char *getname_flags(const char __user *filename, int flags, int *empty)
} }
error: error:
__putname(result); __putname(kname);
error_free_name:
kfree(result);
return err; return err;
} }
char *getname(const char __user * filename) struct filename *
getname(const char __user * filename)
{ {
return getname_flags(filename, 0, NULL); return getname_flags(filename, 0, NULL);
} }
EXPORT_SYMBOL(getname);
#ifdef CONFIG_AUDITSYSCALL #ifdef CONFIG_AUDITSYSCALL
void putname(const char *name) void putname(struct filename *name)
{ {
if (unlikely(!audit_dummy_context())) if (unlikely(!audit_dummy_context()))
audit_putname(name); return audit_putname(name);
else final_putname(name);
__putname(name);
} }
#endif #endif
@ -2093,13 +2115,13 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
struct path *path, int *empty) struct path *path, int *empty)
{ {
struct nameidata nd; struct nameidata nd;
char *tmp = getname_flags(name, flags, empty); struct filename *tmp = getname_flags(name, flags, empty);
int err = PTR_ERR(tmp); int err = PTR_ERR(tmp);
if (!IS_ERR(tmp)) { if (!IS_ERR(tmp)) {
BUG_ON(flags & LOOKUP_PARENT); BUG_ON(flags & LOOKUP_PARENT);
err = do_path_lookup(dfd, tmp, flags, &nd); err = do_path_lookup(dfd, tmp->name, flags, &nd);
putname(tmp); putname(tmp);
if (!err) if (!err)
*path = nd.path; *path = nd.path;
@ -2113,22 +2135,22 @@ int user_path_at(int dfd, const char __user *name, unsigned flags,
return user_path_at_empty(dfd, name, flags, path, NULL); return user_path_at_empty(dfd, name, flags, path, NULL);
} }
static int user_path_parent(int dfd, const char __user *path, static struct filename *
struct nameidata *nd, char **name) user_path_parent(int dfd, const char __user *path, struct nameidata *nd)
{ {
char *s = getname(path); struct filename *s = getname(path);
int error; int error;
if (IS_ERR(s)) if (IS_ERR(s))
return PTR_ERR(s); return s;
error = do_path_lookup(dfd, s, LOOKUP_PARENT, nd); error = do_path_lookup(dfd, s->name, LOOKUP_PARENT, nd);
if (error) if (error) {
putname(s); putname(s);
else return ERR_PTR(error);
*name = s; }
return error; return s;
} }
/* /*
@ -3039,11 +3061,11 @@ EXPORT_SYMBOL(done_path_create);
struct dentry *user_path_create(int dfd, const char __user *pathname, struct path *path, int is_dir) struct dentry *user_path_create(int dfd, const char __user *pathname, struct path *path, int is_dir)
{ {
char *tmp = getname(pathname); struct filename *tmp = getname(pathname);
struct dentry *res; struct dentry *res;
if (IS_ERR(tmp)) if (IS_ERR(tmp))
return ERR_CAST(tmp); return ERR_CAST(tmp);
res = kern_path_create(dfd, tmp, path, is_dir); res = kern_path_create(dfd, tmp->name, path, is_dir);
putname(tmp); putname(tmp);
return res; return res;
} }
@ -3248,13 +3270,13 @@ out:
static long do_rmdir(int dfd, const char __user *pathname) static long do_rmdir(int dfd, const char __user *pathname)
{ {
int error = 0; int error = 0;
char * name; struct filename *name;
struct dentry *dentry; struct dentry *dentry;
struct nameidata nd; struct nameidata nd;
error = user_path_parent(dfd, pathname, &nd, &name); name = user_path_parent(dfd, pathname, &nd);
if (error) if (IS_ERR(name))
return error; return PTR_ERR(name);
switch(nd.last_type) { switch(nd.last_type) {
case LAST_DOTDOT: case LAST_DOTDOT:
@ -3343,14 +3365,14 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
static long do_unlinkat(int dfd, const char __user *pathname) static long do_unlinkat(int dfd, const char __user *pathname)
{ {
int error; int error;
char *name; struct filename *name;
struct dentry *dentry; struct dentry *dentry;
struct nameidata nd; struct nameidata nd;
struct inode *inode = NULL; struct inode *inode = NULL;
error = user_path_parent(dfd, pathname, &nd, &name); name = user_path_parent(dfd, pathname, &nd);
if (error) if (IS_ERR(name))
return error; return PTR_ERR(name);
error = -EISDIR; error = -EISDIR;
if (nd.last_type != LAST_NORM) if (nd.last_type != LAST_NORM)
@ -3434,7 +3456,7 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
int, newdfd, const char __user *, newname) int, newdfd, const char __user *, newname)
{ {
int error; int error;
char *from; struct filename *from;
struct dentry *dentry; struct dentry *dentry;
struct path path; struct path path;
@ -3447,9 +3469,9 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
if (IS_ERR(dentry)) if (IS_ERR(dentry))
goto out_putname; goto out_putname;
error = security_path_symlink(&path, dentry, from); error = security_path_symlink(&path, dentry, from->name);
if (!error) if (!error)
error = vfs_symlink(path.dentry->d_inode, dentry, from); error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
done_path_create(&path, dentry); done_path_create(&path, dentry);
out_putname: out_putname:
putname(from); putname(from);
@ -3729,17 +3751,21 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
struct dentry *old_dentry, *new_dentry; struct dentry *old_dentry, *new_dentry;
struct dentry *trap; struct dentry *trap;
struct nameidata oldnd, newnd; struct nameidata oldnd, newnd;
char *from; struct filename *from;
char *to; struct filename *to;
int error; int error;
error = user_path_parent(olddfd, oldname, &oldnd, &from); from = user_path_parent(olddfd, oldname, &oldnd);
if (error) if (IS_ERR(from)) {
error = PTR_ERR(from);
goto exit; goto exit;
}
error = user_path_parent(newdfd, newname, &newnd, &to); to = user_path_parent(newdfd, newname, &newnd);
if (error) if (IS_ERR(to)) {
error = PTR_ERR(to);
goto exit1; goto exit1;
}
error = -EXDEV; error = -EXDEV;
if (oldnd.path.mnt != newnd.path.mnt) if (oldnd.path.mnt != newnd.path.mnt)

4
fs/namespace.c
View File

@ -2408,7 +2408,7 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
{ {
int ret; int ret;
char *kernel_type; char *kernel_type;
char *kernel_dir; struct filename *kernel_dir;
char *kernel_dev; char *kernel_dev;
unsigned long data_page; unsigned long data_page;
@ -2430,7 +2430,7 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
if (ret < 0) if (ret < 0)
goto out_data; goto out_data;
ret = do_mount(kernel_dev, kernel_dir, kernel_type, flags, ret = do_mount(kernel_dev, kernel_dir->name, kernel_type, flags,
(void *) data_page); (void *) data_page);
free_page(data_page); free_page(data_page);

4
fs/open.c
View File

@ -895,13 +895,13 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
{ {
struct open_flags op; struct open_flags op;
int lookup = build_open_flags(flags, mode, &op); int lookup = build_open_flags(flags, mode, &op);
char *tmp = getname(filename); struct filename *tmp = getname(filename);
int fd = PTR_ERR(tmp); int fd = PTR_ERR(tmp);
if (!IS_ERR(tmp)) { if (!IS_ERR(tmp)) {
fd = get_unused_fd_flags(flags); fd = get_unused_fd_flags(flags);
if (fd >= 0) { if (fd >= 0) {
struct file *f = do_filp_open(dfd, tmp, &op, lookup); struct file *f = do_filp_open(dfd, tmp->name, &op, lookup);
if (IS_ERR(f)) { if (IS_ERR(f)) {
put_unused_fd(fd); put_unused_fd(fd);
fd = PTR_ERR(f); fd = PTR_ERR(f);

4
fs/quota/quota.c
View File

@ -331,11 +331,11 @@ static struct super_block *quotactl_block(const char __user *special, int cmd)
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
struct block_device *bdev; struct block_device *bdev;
struct super_block *sb; struct super_block *sb;
char *tmp = getname(special); struct filename *tmp = getname(special);
if (IS_ERR(tmp)) if (IS_ERR(tmp))
return ERR_CAST(tmp); return ERR_CAST(tmp);
bdev = lookup_bdev(tmp); bdev = lookup_bdev(tmp->name);
putname(tmp); putname(tmp);
if (IS_ERR(bdev)) if (IS_ERR(bdev))
return ERR_CAST(bdev); return ERR_CAST(bdev);

12
include/linux/audit.h
View File

@ -460,6 +460,8 @@ extern int audit_classify_arch(int arch);
#define AUDIT_TYPE_CHILD_DELETE 3 /* a child being deleted */ #define AUDIT_TYPE_CHILD_DELETE 3 /* a child being deleted */
#define AUDIT_TYPE_CHILD_CREATE 4 /* a child being created */ #define AUDIT_TYPE_CHILD_CREATE 4 /* a child being created */
struct filename;
#ifdef CONFIG_AUDITSYSCALL #ifdef CONFIG_AUDITSYSCALL
/* These are defined in auditsc.c */ /* These are defined in auditsc.c */
/* Public API */ /* Public API */
@ -469,8 +471,8 @@ extern void __audit_syscall_entry(int arch,
int major, unsigned long a0, unsigned long a1, int major, unsigned long a0, unsigned long a1,
unsigned long a2, unsigned long a3); unsigned long a2, unsigned long a3);
extern void __audit_syscall_exit(int ret_success, long ret_value); extern void __audit_syscall_exit(int ret_success, long ret_value);
extern void __audit_getname(const char *name); extern void __audit_getname(struct filename *name);
extern void audit_putname(const char *name); extern void audit_putname(struct filename *name);
extern void __audit_inode(const char *name, const struct dentry *dentry, extern void __audit_inode(const char *name, const struct dentry *dentry,
unsigned int parent); unsigned int parent);
extern void __audit_inode_child(const struct inode *parent, extern void __audit_inode_child(const struct inode *parent,
@ -505,7 +507,7 @@ static inline void audit_syscall_exit(void *pt_regs)
__audit_syscall_exit(success, return_code); __audit_syscall_exit(success, return_code);
} }
} }
static inline void audit_getname(const char *name) static inline void audit_getname(struct filename *name)
{ {
if (unlikely(!audit_dummy_context())) if (unlikely(!audit_dummy_context()))
__audit_getname(name); __audit_getname(name);
@ -663,9 +665,9 @@ static inline int audit_dummy_context(void)
{ {
return 1; return 1;
} }
static inline void audit_getname(const char *name) static inline void audit_getname(struct filename *name)
{ } { }
static inline void audit_putname(const char *name) static inline void audit_putname(struct filename *name)
{ } { }
static inline void __audit_inode(const char *name, const struct dentry *dentry, static inline void __audit_inode(const char *name, const struct dentry *dentry,
unsigned int parent) unsigned int parent)

14
include/linux/fs.h
View File

@ -2196,6 +2196,10 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
#endif /* CONFIG_FILE_LOCKING */ #endif /* CONFIG_FILE_LOCKING */
/* fs/open.c */ /* fs/open.c */
struct filename {
const char *name; /* pointer to actual string */
const __user char *uptr; /* original userland pointer */
};
extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs, extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
struct file *filp); struct file *filp);
@ -2208,7 +2212,9 @@ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int); const char *, int);
extern struct file * dentry_open(const struct path *, int, const struct cred *); extern struct file * dentry_open(const struct path *, int, const struct cred *);
extern int filp_close(struct file *, fl_owner_t id); extern int filp_close(struct file *, fl_owner_t id);
extern char * getname(const char __user *);
extern struct filename *getname(const char __user *);
enum { enum {
FILE_CREATED = 1, FILE_CREATED = 1,
FILE_OPENED = 2 FILE_OPENED = 2
@ -2228,12 +2234,14 @@ extern void __init vfs_caches_init(unsigned long);
extern struct kmem_cache *names_cachep; extern struct kmem_cache *names_cachep;
extern void final_putname(struct filename *name);
#define __getname() kmem_cache_alloc(names_cachep, GFP_KERNEL) #define __getname() kmem_cache_alloc(names_cachep, GFP_KERNEL)
#define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) #define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
#ifndef CONFIG_AUDITSYSCALL #ifndef CONFIG_AUDITSYSCALL
#define putname(name) __putname(name) #define putname(name) final_putname(name)
#else #else
extern void putname(const char *name); extern void putname(struct filename *name);
#endif #endif
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK

13
ipc/mqueue.c
View File

@ -772,7 +772,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
{ {
struct path path; struct path path;
struct file *filp; struct file *filp;
char *name; struct filename *name;
struct mq_attr attr; struct mq_attr attr;
int fd, error; int fd, error;
struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns; struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
@ -795,7 +795,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
ro = mnt_want_write(mnt); /* we'll drop it in any case */ ro = mnt_want_write(mnt); /* we'll drop it in any case */
error = 0; error = 0;
mutex_lock(&root->d_inode->i_mutex); mutex_lock(&root->d_inode->i_mutex);
path.dentry = lookup_one_len(name, root, strlen(name)); path.dentry = lookup_one_len(name->name, root, strlen(name->name));
if (IS_ERR(path.dentry)) { if (IS_ERR(path.dentry)) {
error = PTR_ERR(path.dentry); error = PTR_ERR(path.dentry);
goto out_putfd; goto out_putfd;
@ -804,7 +804,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
if (oflag & O_CREAT) { if (oflag & O_CREAT) {
if (path.dentry->d_inode) { /* entry already exists */ if (path.dentry->d_inode) { /* entry already exists */
audit_inode(name, path.dentry, 0); audit_inode(name->name, path.dentry, 0);
if (oflag & O_EXCL) { if (oflag & O_EXCL) {
error = -EEXIST; error = -EEXIST;
goto out; goto out;
@ -824,7 +824,7 @@ SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
error = -ENOENT; error = -ENOENT;
goto out; goto out;
} }
audit_inode(name, path.dentry, 0); audit_inode(name->name, path.dentry, 0);
filp = do_open(&path, oflag); filp = do_open(&path, oflag);
} }
@ -849,7 +849,7 @@ out_putname:
SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name) SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
{ {
int err; int err;
char *name; struct filename *name;
struct dentry *dentry; struct dentry *dentry;
struct inode *inode = NULL; struct inode *inode = NULL;
struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns; struct ipc_namespace *ipc_ns = current->nsproxy->ipc_ns;
@ -863,7 +863,8 @@ SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
if (err) if (err)
goto out_name; goto out_name;
mutex_lock_nested(&mnt->mnt_root->d_inode->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&mnt->mnt_root->d_inode->i_mutex, I_MUTEX_PARENT);
dentry = lookup_one_len(name, mnt->mnt_root, strlen(name)); dentry = lookup_one_len(name->name, mnt->mnt_root,
strlen(name->name));
if (IS_ERR(dentry)) { if (IS_ERR(dentry)) {
err = PTR_ERR(dentry); err = PTR_ERR(dentry);
goto out_unlock; goto out_unlock;

4
kernel/acct.c
View File

@ -260,10 +260,10 @@ SYSCALL_DEFINE1(acct, const char __user *, name)
return -EPERM; return -EPERM;
if (name) { if (name) {
char *tmp = getname(name); struct filename *tmp = getname(name);
if (IS_ERR(tmp)) if (IS_ERR(tmp))
return (PTR_ERR(tmp)); return (PTR_ERR(tmp));
error = acct_on(tmp); error = acct_on(tmp->name);
putname(tmp); putname(tmp);
} else { } else {
struct bsd_acct_struct *acct; struct bsd_acct_struct *acct;

64
kernel/auditsc.c
View File

@ -103,28 +103,29 @@ struct audit_cap_data {
* we don't let putname() free it (instead we free all of the saved * we don't let putname() free it (instead we free all of the saved
* pointers at syscall exit time). * pointers at syscall exit time).
* *
* Further, in fs/namei.c:path_lookup() we store the inode and device. */ * Further, in fs/namei.c:path_lookup() we store the inode and device.
*/
struct audit_names { struct audit_names {
struct list_head list; /* audit_context->names_list */ struct list_head list; /* audit_context->names_list */
const char *name; struct filename *name;
unsigned long ino; unsigned long ino;
dev_t dev; dev_t dev;
umode_t mode; umode_t mode;
kuid_t uid; kuid_t uid;
kgid_t gid; kgid_t gid;
dev_t rdev; dev_t rdev;
u32 osid; u32 osid;
struct audit_cap_data fcap; struct audit_cap_data fcap;
unsigned int fcap_ver; unsigned int fcap_ver;
int name_len; /* number of name's characters to log */ int name_len; /* number of name's characters to log */
unsigned char type; /* record type */ unsigned char type; /* record type */
bool name_put; /* call __putname() for this name */ bool name_put; /* call __putname() for this name */
/* /*
* This was an allocated audit_names and not from the array of * This was an allocated audit_names and not from the array of
* names allocated in the task audit context. Thus this name * names allocated in the task audit context. Thus this name
* should be freed on syscall exit * should be freed on syscall exit
*/ */
bool should_free; bool should_free;
}; };
struct audit_aux_data { struct audit_aux_data {
@ -996,7 +997,7 @@ static inline void audit_free_names(struct audit_context *context)
context->ino_count); context->ino_count);
list_for_each_entry(n, &context->names_list, list) { list_for_each_entry(n, &context->names_list, list) {
printk(KERN_ERR "names[%d] = %p = %s\n", i, printk(KERN_ERR "names[%d] = %p = %s\n", i,
n->name, n->name ?: "(null)"); n->name, n->name->name ?: "(null)");
} }
dump_stack(); dump_stack();
return; return;
@ -1553,7 +1554,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
case AUDIT_NAME_FULL: case AUDIT_NAME_FULL:
/* log the full path */ /* log the full path */
audit_log_format(ab, " name="); audit_log_format(ab, " name=");
audit_log_untrustedstring(ab, n->name); audit_log_untrustedstring(ab, n->name->name);
break; break;
case 0: case 0:
/* name was specified as a relative path and the /* name was specified as a relative path and the
@ -1563,7 +1564,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,
default: default:
/* log the name's directory component */ /* log the name's directory component */
audit_log_format(ab, " name="); audit_log_format(ab, " name=");
audit_log_n_untrustedstring(ab, n->name, audit_log_n_untrustedstring(ab, n->name->name,
n->name_len); n->name_len);
} }
} else } else
@ -2026,7 +2027,7 @@ static struct audit_names *audit_alloc_name(struct audit_context *context,
* Add a name to the list of audit names for this context. * Add a name to the list of audit names for this context.
* Called from fs/namei.c:getname(). * Called from fs/namei.c:getname().
*/ */
void __audit_getname(const char *name) void __audit_getname(struct filename *name)
{ {
struct audit_context *context = current->audit_context; struct audit_context *context = current->audit_context;
struct audit_names *n; struct audit_names *n;
@ -2040,6 +2041,11 @@ void __audit_getname(const char *name)
return; return;
} }
#if AUDIT_DEBUG
/* The filename _must_ have a populated ->name */
BUG_ON(!name->name);
#endif
n = audit_alloc_name(context, AUDIT_TYPE_UNKNOWN); n = audit_alloc_name(context, AUDIT_TYPE_UNKNOWN);
if (!n) if (!n)
return; return;
@ -2059,7 +2065,7 @@ void __audit_getname(const char *name)
* then we delay the putname until syscall exit. * then we delay the putname until syscall exit.
* Called from include/linux/fs.h:putname(). * Called from include/linux/fs.h:putname().
*/ */
void audit_putname(const char *name) void audit_putname(struct filename *name)
{ {
struct audit_context *context = current->audit_context; struct audit_context *context = current->audit_context;
@ -2074,7 +2080,7 @@ void audit_putname(const char *name)
list_for_each_entry(n, &context->names_list, list) list_for_each_entry(n, &context->names_list, list)
printk(KERN_ERR "name[%d] = %p = %s\n", i, printk(KERN_ERR "name[%d] = %p = %s\n", i,
n->name, n->name ?: "(null)"); n->name, n->name->name ?: "(null)");
} }
#endif #endif
__putname(name); __putname(name);
@ -2088,8 +2094,8 @@ void audit_putname(const char *name)
" put_count=%d\n", " put_count=%d\n",
__FILE__, __LINE__, __FILE__, __LINE__,
context->serial, context->major, context->serial, context->major,
context->in_syscall, name, context->name_count, context->in_syscall, name->name,
context->put_count); context->name_count, context->put_count);
dump_stack(); dump_stack();
} }
} }
@ -2152,7 +2158,7 @@ void __audit_inode(const char *name, const struct dentry *dentry,
list_for_each_entry_reverse(n, &context->names_list, list) { list_for_each_entry_reverse(n, &context->names_list, list) {
/* does the name pointer match? */ /* does the name pointer match? */
if (n->name != name) if (!n->name || n->name->name != name)
continue; continue;
/* match the correct record type */ /* match the correct record type */
@ -2175,7 +2181,7 @@ out_alloc:
return; return;
out: out:
if (parent) { if (parent) {
n->name_len = n->name ? parent_len(n->name) : AUDIT_NAME_FULL; n->name_len = n->name ? parent_len(n->name->name) : AUDIT_NAME_FULL;
n->type = AUDIT_TYPE_PARENT; n->type = AUDIT_TYPE_PARENT;
} else { } else {
n->name_len = AUDIT_NAME_FULL; n->name_len = AUDIT_NAME_FULL;
@ -2220,7 +2226,7 @@ void __audit_inode_child(const struct inode *parent,
continue; continue;
if (n->ino == parent->i_ino && if (n->ino == parent->i_ino &&
!audit_compare_dname_path(dname, n->name, n->name_len)) { !audit_compare_dname_path(dname, n->name->name, n->name_len)) {
found_parent = n; found_parent = n;
break; break;
} }
@ -2236,8 +2242,8 @@ void __audit_inode_child(const struct inode *parent,
if (found_parent && (n->name != found_parent->name)) if (found_parent && (n->name != found_parent->name))
continue; continue;
if (!strcmp(dname, n->name) || if (!strcmp(dname, n->name->name) ||
!audit_compare_dname_path(dname, n->name, !audit_compare_dname_path(dname, n->name->name,
found_parent ? found_parent ?
found_parent->name_len : found_parent->name_len :
AUDIT_NAME_FULL)) { AUDIT_NAME_FULL)) {

11
mm/swapfile.c
View File

@ -1483,7 +1483,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
struct file *swap_file, *victim; struct file *swap_file, *victim;
struct address_space *mapping; struct address_space *mapping;
struct inode *inode; struct inode *inode;
char *pathname; struct filename *pathname;
int oom_score_adj; int oom_score_adj;
int i, type, prev; int i, type, prev;
int err; int err;
@ -1498,8 +1498,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
if (IS_ERR(pathname)) if (IS_ERR(pathname))
goto out; goto out;
victim = filp_open(pathname, O_RDWR|O_LARGEFILE, 0); victim = filp_open(pathname->name, O_RDWR|O_LARGEFILE, 0);
putname(pathname);
err = PTR_ERR(victim); err = PTR_ERR(victim);
if (IS_ERR(victim)) if (IS_ERR(victim))
goto out; goto out;
@ -1936,7 +1935,7 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
{ {
struct swap_info_struct *p; struct swap_info_struct *p;
char *name; struct filename *name;
struct file *swap_file = NULL; struct file *swap_file = NULL;
struct address_space *mapping; struct address_space *mapping;
int i; int i;
@ -1967,7 +1966,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
name = NULL; name = NULL;
goto bad_swap; goto bad_swap;
} }
swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0); swap_file = filp_open(name->name, O_RDWR|O_LARGEFILE, 0);
if (IS_ERR(swap_file)) { if (IS_ERR(swap_file)) {
error = PTR_ERR(swap_file); error = PTR_ERR(swap_file);
swap_file = NULL; swap_file = NULL;
@ -2053,7 +2052,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
printk(KERN_INFO "Adding %uk swap on %s. " printk(KERN_INFO "Adding %uk swap on %s. "
"Priority:%d extents:%d across:%lluk %s%s%s\n", "Priority:%d extents:%d across:%lluk %s%s%s\n",
p->pages<<(PAGE_SHIFT-10), name, p->prio, p->pages<<(PAGE_SHIFT-10), name->name, p->prio,
nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10), nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),
(p->flags & SWP_SOLIDSTATE) ? "SS" : "", (p->flags & SWP_SOLIDSTATE) ? "SS" : "",
(p->flags & SWP_DISCARDABLE) ? "D" : "", (p->flags & SWP_DISCARDABLE) ? "D" : "",