All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jia-Ju Bai <baijiaju1990@163.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jia-Ju Bai <baijiaju1990@163.com>
Subject: [PATCH] fs: xfs: Fix a lock-twice and sleep-in-atomic bug in xfs_iget
Date: Mon,  5 Jun 2017 16:17:29 +0800	[thread overview]
Message-ID: <1496650649-2296-1-git-send-email-baijiaju1990@163.com> (raw)

The driver may sleep under a read rcu lock, and function call path is:
xfs_iget (acquire the lock by rcu_read_lock)
  "goto out_error_or_again" after xfs_iget_cache_hit
    delay
      schedule_timeout_uninterruptible --> may sleep
Meanwhile, the rcu_read_lock will be called twice in this situation.

To fix it, the lock is released before "goto".

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
---
 fs/xfs/xfs_icache.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index f61c84f8..c2a4722 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -600,8 +600,10 @@ struct xfs_inode *
 
 	if (ip) {
 		error = xfs_iget_cache_hit(pag, ip, ino, flags, lock_flags);
-		if (error)
+		if (error) {
+			rcu_read_unlock();
 			goto out_error_or_again;
+		}
 	} else {
 		rcu_read_unlock();
 		XFS_STATS_INC(mp, xs_ig_missed);
-- 
1.7.9.5

             reply	other threads:[~2017-06-05  8:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-05  8:17 Jia-Ju Bai [this message]
2017-06-05  8:32 ` [PATCH] fs: xfs: Fix a lock-twice and sleep-in-atomic bug in xfs_iget Shan Hai
2017-06-05  8:56   ` Jia-Ju Bai
2017-06-08  5:55 ` [lkp-robot] [fs] 8ba626f5b2: BUG:scheduling_while_atomic kernel test robot
2017-06-08  5:55   ` kernel test robot
2017-06-08  5:55   ` kernel test robot

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=1496650649-2296-1-git-send-email-baijiaju1990@163.com \
    --to=baijiaju1990@163.com \
    --cc=darrick.wong@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.