shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

gfs2: Silence "suspicious RCU usage in gfs2_permission" warning

Browse Source 
[ Upstream commit 074d7306a4fe22fcac0b53f699f92757ab1cee99 ]

Commit 0abd1557e21c added rcu_dereference() for dereferencing ip->i_gl
in gfs2_permission.  This now causes lockdep to complain when
gfs2_permission is called in non-RCU context:

    WARNING: suspicious RCU usage in gfs2_permission

Switch to rcu_dereference_check() and check for the MAY_NOT_BLOCK flag
to shut up lockdep when we know that dereferencing ip->i_gl is safe.

Fixes: 0abd1557e21c ("gfs2: fix an oops in gfs2_permission")
Reported-by: syzbot+3e5130844b0c0e2b4948@syzkaller.appspotmail.com
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andreas Gruenbacher
2023-10-30 22:06:05 +01:00
committed by Greg Kroah-Hartman
parent 7749fd2dbe
commit 58278cc71d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/gfs2/inode.c
View File

@@ -1845,6 +1845,7 @@ out:
int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode, int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode,
int mask) int mask)
{ {
int may_not_block = mask & MAY_NOT_BLOCK;
struct gfs2_inode *ip; struct gfs2_inode *ip;
struct gfs2_holder i_gh; struct gfs2_holder i_gh;
struct gfs2_glock *gl; struct gfs2_glock *gl;
@@ -1852,14 +1853,14 @@ int gfs2_permission(struct user_namespace *mnt_userns, struct inode *inode,
gfs2_holder_mark_uninitialized(&i_gh); gfs2_holder_mark_uninitialized(&i_gh);
ip = GFS2_I(inode); ip = GFS2_I(inode);
gl = rcu_dereference(ip->i_gl); gl = rcu_dereference_check(ip->i_gl, !may_not_block);
if (unlikely(!gl)) { if (unlikely(!gl)) {
/* inode is getting torn down, must be RCU mode */ /* inode is getting torn down, must be RCU mode */
WARN_ON_ONCE(!(mask & MAY_NOT_BLOCK)); WARN_ON_ONCE(!may_not_block);
return -ECHILD; return -ECHILD;
} }
if (gfs2_glock_is_locked_by_me(gl) == NULL) { if (gfs2_glock_is_locked_by_me(gl) == NULL) {
if (mask & MAY_NOT_BLOCK) if (may_not_block)
return -ECHILD; return -ECHILD;
error = gfs2_glock_nq_init(gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); error = gfs2_glock_nq_init(gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
if (error) if (error)