diff options
| author | Jeff Layton <jlayton@kernel.org> | 2019-12-05 08:41:25 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-01 13:14:31 +0200 |
| commit | 4d9cf934d67f32712e444587022aef17bba85276 (patch) | |
| tree | 95ef019a666dd3609c4b39eeb9adb09235b96254 /fs | |
| parent | a567bac12f116deb32f1a5b78346872ce1256e3d (diff) | |
| download | linux-stable-4d9cf934d67f32712e444587022aef17bba85276.tar.gz linux-stable-4d9cf934d67f32712e444587022aef17bba85276.tar.bz2 linux-stable-4d9cf934d67f32712e444587022aef17bba85276.zip | |
ceph: ensure we have a new cap before continuing in fill_inode
[ Upstream commit 9a6bed4fe0c8bf57785cbc4db9f86086cb9b193d ]
If the caller passes in a NULL cap_reservation, and we can't allocate
one then ensure that we fail gracefully.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 1e438e0faf77..3c24fb77ef32 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -764,8 +764,11 @@ static int fill_inode(struct inode *inode, struct page *locked_page, info_caps = le32_to_cpu(info->cap.caps); /* prealloc new cap struct */ - if (info_caps && ceph_snap(inode) == CEPH_NOSNAP) + if (info_caps && ceph_snap(inode) == CEPH_NOSNAP) { new_cap = ceph_get_cap(mdsc, caps_reservation); + if (!new_cap) + return -ENOMEM; + } /* * prealloc xattr data, if it looks like we'll need it. only |