leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VFS: Make more complete truncate operation available to CacheFiles

Browse Source 
Make a more complete truncate operation available to CacheFiles (including
security checks and suchlike) so that it can use this to clear invalidated
cache files.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
David Howells 2012-12-20 21:52:36 +00:00
parent ef778e7ae6
commit a02de96085
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fs/open.c
View File

@ -61,33 +61,22 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
return ret;
}
static long do_sys_truncate(const char __user *pathname, loff_t length)
long vfs_truncate(struct path *path, loff_t length)
{
struct path path;
struct inode *inode;
int error;
long error;
error = -EINVAL;
if (length < 0) /* sorry, but loff_t says... */
goto out;
error = user_path(pathname, &path);
if (error)
goto out;
inode = path.dentry->d_inode;
inode = path->dentry->d_inode;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
error = -EISDIR;
if (S_ISDIR(inode->i_mode))
goto dput_and_out;
error = -EINVAL;
return -EISDIR;
if (!S_ISREG(inode->i_mode))
goto dput_and_out;
return -EINVAL;
error = mnt_want_write(path.mnt);
error = mnt_want_write(path->mnt);
if (error)
goto dput_and_out;
goto out;
error = inode_permission(inode, MAY_WRITE);
if (error)
@ -111,19 +100,34 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
error = locks_verify_truncate(inode, NULL, length);
if (!error)
error = security_path_truncate(&path);
error = security_path_truncate(path);
if (!error)
error = do_truncate(path.dentry, length, 0, NULL);
error = do_truncate(path->dentry, length, 0, NULL);
put_write_and_out:
put_write_access(inode);
mnt_drop_write_and_out:
mnt_drop_write(path.mnt);
dput_and_out:
path_put(&path);
mnt_drop_write(path->mnt);
out:
return error;
}
EXPORT_SYMBOL_GPL(vfs_truncate);
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
struct path path;
int error;
if (length < 0) /* sorry, but loff_t says... */
return -EINVAL;
error = user_path(pathname, &path);
if (!error) {
error = vfs_truncate(&path, length);
path_put(&path);
}
return error;
}
SYSCALL_DEFINE2(truncate, const char __user *, path, long, length)
{

1
include/linux/fs.h
View File

@ -1999,6 +1999,7 @@ struct filename {
bool separate; /* should "name" be freed? */
};
extern long vfs_truncate(struct path *, loff_t);
extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
struct file *filp);
extern int do_fallocate(struct file *file, int mode, loff_t offset,