diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 10:23:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 10:23:34 -0800 |
| commit | eebe75827b73b0a61e84acd2033ce304a3166d70 (patch) | |
| tree | 721afe7821673ad1efd497428f5fbd7571cdfbc7 | |
| parent | Merge tag 'vfs-6.8-rc1.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs (diff) | |
| parent | f2fs: fix double free of f2fs_sb_info (diff) | |
| download | wireguard-linux-eebe75827b73b0a61e84acd2033ce304a3166d70.tar.xz wireguard-linux-eebe75827b73b0a61e84acd2033ce304a3166d70.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt fix from Eric Biggers:
"Fix a bug in my change to how f2fs frees its superblock info (which
was part of changing the timing of fscrypt keyring destruction)"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
f2fs: fix double free of f2fs_sb_info
| -rw-r--r-- | fs/f2fs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index d00d21a8b53a..d45ab0992ae5 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4880,6 +4880,7 @@ free_sbi: if (sbi->s_chksum_driver) crypto_free_shash(sbi->s_chksum_driver); kfree(sbi); + sb->s_fs_info = NULL; /* give only one another chance */ if (retry_cnt > 0 && skip_recovery) { |