public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Nikolay Borisov <kernel@kyup.com>
To: zyan@redhat.com, idryomov@gmail.com
Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nikolay Borisov <kernel@kyup.com>
Subject: [PATCHv2] ceph: Fix error handling in ceph_read_iter
Date: Mon, 10 Oct 2016 15:56:39 +0300	[thread overview]
Message-ID: <1476104199-3259-1-git-send-email-kernel@kyup.com> (raw)
In-Reply-To: <1476103098-2925-1-git-send-email-kernel@kyup.com>

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>
Link: http://www.spinics.net/lists/ceph-users/msg31592.html
---

Inverted the condition, so resending with correct condition
this time. 

 fs/ceph/file.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 3c68e6aee2f0..7413313ae6c8 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -929,7 +929,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;
-- 
2.5.0

  reply	other threads:[~2016-10-10 12:56 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-10 12:38 [PATCH] ceph: Fix error handling in ceph_read_iter Nikolay Borisov
2016-10-10 12:56 ` Nikolay Borisov [this message]
2016-10-10 13:11   ` [PATCHv2] " Yan, Zheng
2016-10-10 13:13     ` Nikolay Borisov
2016-10-10 13:14       ` Yan, Zheng
2016-10-10 13:50       ` Ilya Dryomov
2016-10-10 15:09         ` Yan, Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1476104199-3259-1-git-send-email-kernel@kyup.com \
    --to=kernel@kyup.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=idryomov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=zyan@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox