From: Jan Kara <jack@suse.cz>
Date: Mon, 28 Nov 2005 21:44:14 +0000 (-0800)
Subject: [PATCH] Fix oops in vfs_quotaon_mount()
X-Git-Tag: v2.6.15-rc3~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=154f484b92e5c25c400f6903512c511644a49322;p=linux-2.6

[PATCH] Fix oops in vfs_quotaon_mount()

When quota file specified in mount options did not exist, we tried to
dereference NULL pointer later. Fix it.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/dquot.c b/fs/dquot.c
index 05b60283c9..2a62b3dc20 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -1513,10 +1513,16 @@ int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
 	if (IS_ERR(dentry))
 		return PTR_ERR(dentry);
 
+	if (!dentry->d_inode) {
+		error = -ENOENT;
+		goto out;
+	}
+
 	error = security_quota_on(dentry);
 	if (!error)
 		error = vfs_quota_on_inode(dentry->d_inode, type, format_id);
 
+out:
 	dput(dentry);
 	return error;
 }