From: MIngyi Cong <congmingyi@gmail.com>
To: linkinjeon@kernel.org, senozhatsky@chromium.org,
sfrench@samba.org, hyc.lee@gmail.com
Cc: congmingyi@gmail.com, linux-kernel@vger.kernel.org,
linux-cifs@vger.kernel.org
Subject: [PATCH] fs: add the tuncate check of exfat and hfsplus
Date: Sat, 4 Mar 2023 16:35:59 +0800 [thread overview]
Message-ID: <20230304083559.172398-1-congmingyi@gmail.com> (raw)
From: Mingyi Cong <congmingyi@gmail.com>
EXFAT and HFSPLUS will fill zero data in truncated range.
Fix this by adding *_SUPER_MAGIC check.
Signed-off-by: Mingyi Cong <congmingyi@gmail.com>
---
fs/ksmbd/smb2pdu.c | 4 +++-
include/uapi/linux/magic.h | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index ac029dfd2..10ab929ad 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -5738,7 +5738,9 @@ static int set_end_of_file_info(struct ksmbd_work *work, struct ksmbd_file *fp,
* truncate of some filesystem like FAT32 fill zero data in
* truncated range.
*/
- if (inode->i_sb->s_magic != MSDOS_SUPER_MAGIC) {
+ if (inode->i_sb->s_magic != MSDOS_SUPER_MAGIC ||
+ inode->i_sb->s_magic != EXFAT_SUPER_MAGIC ||
+ inode->i_sb->s_magic != HFSPLUS_SUPER_MAGIC) {
ksmbd_debug(SMB, "filename : %s truncated to newsize %lld\n",
fp->filename, newsize);
rc = ksmbd_vfs_truncate(work, fp, newsize);
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 35687dcb1..687b7f584 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -43,6 +43,8 @@
#define MINIX3_SUPER_MAGIC 0x4d5a /* minix v3 fs, 60 char names */
#define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
+#define EXFAT_SUPER_MAGIC 0x2011BAB0UL /* EXFAT */
+#define HFSPLUS_SUPER_MAGIC 0x482b /* HFSPLUS */
#define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */
#define NFS_SUPER_MAGIC 0x6969
#define OCFS2_SUPER_MAGIC 0x7461636f
--
2.34.1
next reply other threads:[~2023-03-04 8:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-04 8:35 MIngyi Cong [this message]
2023-03-07 9:38 ` [PATCH] fs: add the tuncate check of exfat and hfsplus Namjae Jeon
2023-03-28 13:13 ` [PATCH v3] fs: add the tuncate check of exfat Mingyi Cong
2023-03-28 23:54 ` Christoph Hellwig
2023-03-07 13:57 ` [PATCH v2] fs: add the tuncate check of hfs, exfat and hfsplus MIngyi Cong
2023-03-16 14:27 ` [PATCH v3] fs: add the tuncate check of exfat MIngyi Cong
2023-03-16 14:47 ` Christoph Hellwig
[not found] ` <CAABeQzW++EWfW1rKqqKJCDN5eTceVJ4r380SA6Dg99CRZtUKFw@mail.gmail.com>
2023-03-20 13:44 ` Christoph Hellwig
2023-03-16 14:35 ` MIngyi Cong
2023-03-16 14:45 ` MIngyi Cong
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=20230304083559.172398-1-congmingyi@gmail.com \
--to=congmingyi@gmail.com \
--cc=hyc.lee@gmail.com \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=senozhatsky@chromium.org \
--cc=sfrench@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox