diff options
| author | Nikolay Borisov <kernel@kyup.com> | 2016-10-10 15:38:18 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-28 03:45:29 -0400 |
| commit | d3f1ec54e3453e54463fcff5be36ec8ebc06de53 (patch) | |
| tree | c6c243409d820eb9a855c62956d7a7b173ba5cab | |
| parent | d08622e1f544a2cdc052a0c1f72feb9bd8b6dbae (diff) | |
| download | lwn-d3f1ec54e3453e54463fcff5be36ec8ebc06de53.tar.gz lwn-d3f1ec54e3453e54463fcff5be36ec8ebc06de53.zip | |
ceph: fix error handling in ceph_read_iter
commit 0d7718f666be181fda1ba2d08f137d87c1419347 upstream.
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.
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 0f5375d8e030..eede975e85c0 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1272,7 +1272,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; |