summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorLuis Henriques <lhenriques@suse.com>2018-11-05 19:00:52 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-27 16:13:05 +0100
commit956d9dd3a7eb3fdf19e068150e675af5afff5b7b (patch)
tree61fea8f2ed5c8c30c9d54bd753e3a120d754d8a4 /fs/ceph
parent990746203150ef965ecb649c9206bf023c63f781 (diff)
downloadlinux-stable-956d9dd3a7eb3fdf19e068150e675af5afff5b7b.tar.gz
linux-stable-956d9dd3a7eb3fdf19e068150e675af5afff5b7b.tar.bz2
linux-stable-956d9dd3a7eb3fdf19e068150e675af5afff5b7b.zip
ceph: quota: fix null pointer dereference in quota check
[ Upstream commit 71f2cc64d027d712f29bf8d09d3e123302d5f245 ] This patch fixes a possible null pointer dereference in check_quota_exceeded, detected by the static checker smatch, with the following warning:    fs/ceph/quota.c:240 check_quota_exceeded()     error: we previously assumed 'realm' could be null (see line 188) Fixes: b7a2921765cf ("ceph: quota: support for ceph.quota.max_files") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Luis Henriques <lhenriques@suse.com> Reviewed-by: "Yan, Zheng" <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/quota.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c
index 32d4f13784ba..03f4d24db8fe 100644
--- a/fs/ceph/quota.c
+++ b/fs/ceph/quota.c
@@ -237,7 +237,8 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
ceph_put_snap_realm(mdsc, realm);
realm = next;
}
- ceph_put_snap_realm(mdsc, realm);
+ if (realm)
+ ceph_put_snap_realm(mdsc, realm);
up_read(&mdsc->snap_rwsem);
return exceeded;