system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-16 09:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

cachefiles: use path_get instead of lone dget

Browse source 
Dentry references should not be acquired without a corresponding
vfsmount ref.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2010-08-10 11:41:35 +02:00 committed by Al Viro
parent 6d0b5456e1
commit 542ce7a9bc
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/cachefiles/daemon.c
View file

@ -553,7 +553,7 @@ static int cachefiles_daemon_tag(struct cachefiles_cache *cache, char *args)
static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
{
struct fs_struct *fs;
struct dentry *dir;
struct path path;
const struct cred *saved_cred;
int ret;
@ -575,22 +575,23 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
/* extract the directory dentry from the cwd */
fs = current->fs;
read_lock(&fs->lock);
dir = dget(fs->pwd.dentry);
path = fs->pwd;
path_get(&path);
read_unlock(&fs->lock);
if (!S_ISDIR(dir->d_inode->i_mode))
if (!S_ISDIR(path.dentry->d_inode->i_mode))
goto notdir;
cachefiles_begin_secure(cache, &saved_cred);
ret = cachefiles_cull(cache, dir, args);
ret = cachefiles_cull(cache, path.dentry, args);
cachefiles_end_secure(cache, saved_cred);
dput(dir);
path_put(&path);
_leave(" = %d", ret);
return ret;
notdir:
dput(dir);
path_put(&path);
kerror("cull command requires dirfd to be a directory");
return -ENOTDIR;
@ -629,7 +630,7 @@ static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args)
static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
{
struct fs_struct *fs;
struct dentry *dir;
struct path path;
const struct cred *saved_cred;
int ret;
@ -651,22 +652,23 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
/* extract the directory dentry from the cwd */
fs = current->fs;
read_lock(&fs->lock);
dir = dget(fs->pwd.dentry);
path = fs->pwd;
path_get(&path);
read_unlock(&fs->lock);
if (!S_ISDIR(dir->d_inode->i_mode))
if (!S_ISDIR(path.dentry->d_inode->i_mode))
goto notdir;
cachefiles_begin_secure(cache, &saved_cred);
ret = cachefiles_check_in_use(cache, dir, args);
ret = cachefiles_check_in_use(cache, path.dentry, args);
cachefiles_end_secure(cache, saved_cred);
dput(dir);
path_put(&path);
//_leave(" = %d", ret);
return ret;
notdir:
dput(dir);
path_put(&path);
kerror("inuse command requires dirfd to be a directory");
return -ENOTDIR;