Skip to content

Commit

Permalink
[PATCH] quota: sanitize dentry handling in vfs_quota_on_mount
Browse files Browse the repository at this point in the history
Use lookup_one_len instead of opencoding a simplified lookup using
lookup_hash with a fake hash.

Also there's no need anymore for the d_invalidate as we have a completely
valid dentry now.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Christoph Hellwig authored and Linus Torvalds committed Jun 23, 2005
1 parent 84de856 commit 2fa389c
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions fs/dquot.c
Original file line number Diff line number Diff line change
Expand Up @@ -1522,24 +1522,17 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
int format_id, int type)
{
struct qstr name = {.name = qf_name, .len = 0, .len = strlen(qf_name)};
struct dentry *dentry;
int error;

dentry = lookup_hash(&name, sb->s_root);
dentry = lookup_one_len(qf_name, sb->s_root, strlen(qf_name));
if (IS_ERR(dentry))
return PTR_ERR(dentry);

error = security_quota_on(dentry);
if (!error)
error = vfs_quota_on_inode(dentry->d_inode, type, format_id);

/*
* Now invalidate and put the dentry - quota got its own reference
* to inode and dentry has at least wrong hash so we had better
* throw it away.
*/
d_invalidate(dentry);
dput(dentry);
return error;
}
Expand Down

0 comments on commit 2fa389c

Please sign in to comment.