From: Shreeya Patel <shreeya.patel@collabora.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org,
chao@kernel.org, krisman@collabora.com, ebiggers@google.com,
drosen@google.com, ebiggers@kernel.org, yuchao0@huawei.com
Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-fsdevel@vger.kernel.org, kernel@collabora.com,
andre.almeida@collabora.com
Subject: [PATCH v4 2/5] fs: Check if utf8 encoding is loaded before calling utf8_unload()
Date: Thu, 25 Mar 2021 05:38:08 +0530 [thread overview]
Message-ID: <20210325000811.1379641-3-shreeya.patel@collabora.com> (raw)
In-Reply-To: <20210325000811.1379641-1-shreeya.patel@collabora.com>
utf8_unload is being called if CONFIG_UNICODE is enabled.
The ifdef block doesn't check if utf8 encoding has been loaded
or not before calling the utf8_unload() function.
This is not the expected behavior since it would sometimes lead
to unloading utf8 even before loading it.
Hence, add a condition which will check if sb->encoding is NOT NULL
before calling the utf8_unload().
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
---
fs/ext4/super.c | 6 ++++--
fs/f2fs/super.c | 9 ++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ad34a37278cd..e438d14f9a87 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1259,7 +1259,8 @@ static void ext4_put_super(struct super_block *sb)
fs_put_dax(sbi->s_daxdev);
fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);
#ifdef CONFIG_UNICODE
- utf8_unload(sb->s_encoding);
+ if (sb->s_encoding)
+ utf8_unload(sb->s_encoding);
#endif
kfree(sbi);
}
@@ -5165,7 +5166,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
crypto_free_shash(sbi->s_chksum_driver);
#ifdef CONFIG_UNICODE
- utf8_unload(sb->s_encoding);
+ if (sb->s_encoding)
+ utf8_unload(sb->s_encoding);
#endif
#ifdef CONFIG_QUOTA
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 7069793752f1..0a04983c294e 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1430,7 +1430,8 @@ static void f2fs_put_super(struct super_block *sb)
for (i = 0; i < NR_PAGE_TYPE; i++)
kvfree(sbi->write_io[i]);
#ifdef CONFIG_UNICODE
- utf8_unload(sb->s_encoding);
+ if (sb->s_encoding)
+ utf8_unload(sb->s_encoding);
#endif
kfree(sbi);
}
@@ -4073,8 +4074,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
kvfree(sbi->write_io[i]);
#ifdef CONFIG_UNICODE
- utf8_unload(sb->s_encoding);
- sb->s_encoding = NULL;
+ if (sb->s_encoding) {
+ utf8_unload(sb->s_encoding);
+ sb->s_encoding = NULL;
+ }
#endif
free_options:
#ifdef CONFIG_QUOTA
--
2.30.1
next prev parent reply other threads:[~2021-03-25 0:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 0:08 [PATCH v4 0/5] Make UTF-8 encoding loadable Shreeya Patel
2021-03-25 0:08 ` [PATCH v4 1/5] fs: unicode: Use strscpy() instead of strncpy() Shreeya Patel
2021-03-25 0:08 ` Shreeya Patel [this message]
2021-03-25 19:21 ` [PATCH v4 2/5] fs: Check if utf8 encoding is loaded before calling utf8_unload() Eric Biggers
2021-03-25 19:31 ` Gabriel Krisman Bertazi
2021-03-25 19:43 ` Eric Biggers
2021-03-25 0:08 ` [PATCH v4 3/5] fs: unicode: Rename function names from utf8 to unicode Shreeya Patel
2021-03-25 19:24 ` Eric Biggers
2021-03-25 0:08 ` [PATCH v4 4/5] fs: unicode: Rename utf8-core file to unicode-core Shreeya Patel
2021-03-25 0:08 ` [PATCH v4 5/5] fs: unicode: Add utf8 module and a unicode layer Shreeya Patel
2021-03-25 19:40 ` Eric Biggers
2021-03-25 20:26 ` Shreeya Patel
2021-03-25 21:26 ` Shreeya Patel
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=20210325000811.1379641-3-shreeya.patel@collabora.com \
--to=shreeya.patel@collabora.com \
--cc=adilger.kernel@dilger.ca \
--cc=andre.almeida@collabora.com \
--cc=chao@kernel.org \
--cc=drosen@google.com \
--cc=ebiggers@google.com \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=kernel@collabora.com \
--cc=krisman@collabora.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=yuchao0@huawei.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;
as well as URLs for NNTP newsgroup(s).