diff options
author | Nikolay Borisov <kernel@kyup.com> | 2016-10-10 15:38:18 +0300 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2016-11-01 15:17:06 -0400 |
commit | 66f38bf99faa0b30d7486906738da66b56fb7d80 (patch) | |
tree | 03542d5893542f099406dfdaf4bbd3cd45585628 /fs | |
parent | 9e9ca450cd93936f0a40daf66ce45e93d0873088 (diff) |
ceph: fix error handling in ceph_read_iter
[ Upstream commit 0d7718f666be181fda1ba2d08f137d87c1419347 ]
In case __ceph_do_getattr returns an error and the retry_op in
ceph_read_iter is not READ_INLINE, then it's possible to invoke
__free_page on a page which is NULL, this naturally leads to a crash.
This can happen when, for example, a process waiting on a MDS reply
receives sigterm.
Fix this by explicitly checking whether the page is set or not.
Cc: stable@vger.kernel.org # 3.19+
Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 3b6b522b4b31..5ae447cbd2b5 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -868,7 +868,8 @@ again: statret = __ceph_do_getattr(inode, page, CEPH_STAT_CAP_INLINE_DATA, !!page); if (statret < 0) { - __free_page(page); + if (page) + __free_page(page); if (statret == -ENODATA) { BUG_ON(retry_op != READ_INLINE); goto again; |