diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-10 16:48:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-10 16:48:35 -0500 |
| commit | 2a78769da34b792cc4c4f7157cda6b622fab0872 (patch) | |
| tree | 7252bc14fd2de3e1f8631cfbb5fa24977cad6c11 /fs | |
| parent | ad2fd53a7870a395b8564697bef6c329d017c6c9 (diff) | |
| parent | 504a10d9e46bc37b23d0a1ae2f28973c8516e636 (diff) | |
Merge tag 'gfs2-v6.3-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fix from Andreas Gruenbacher:
- Fix a NULL pointer dereference when mounting corrupted filesystems
* tag 'gfs2-v6.3-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: Don't deref jdesc in evict
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/super.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 5eed8c237500..a84bf6444bba 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1419,6 +1419,14 @@ static void gfs2_evict_inode(struct inode *inode) if (inode->i_nlink || sb_rdonly(sb) || !ip->i_no_addr) goto out; + /* + * In case of an incomplete mount, gfs2_evict_inode() may be called for + * system files without having an active journal to write to. In that + * case, skip the filesystem evict. + */ + if (!sdp->sd_jdesc) + goto out; + gfs2_holder_mark_uninitialized(&gh); ret = evict_should_delete(inode, &gh); if (ret == SHOULD_DEFER_EVICTION) |