From: chenxiaosong.chenxiaosong@linux.dev
To: smfrench@gmail.com, linkinjeon@kernel.org, pc@manguebit.org,
ronniesahlberg@gmail.com, sprasad@microsoft.com, tom@talpey.com,
bharathsm@microsoft.com, senozhatsky@chromium.org,
dhowells@redhat.com
Cc: linux-cifs@vger.kernel.org, ChenXiaoSong <chenxiaosong@kylinos.cn>
Subject: [PATCH v6 3/5] smb/client: check whether smb2_error_map_table is sorted in ascending order
Date: Thu, 25 Dec 2025 10:10:33 +0800 [thread overview]
Message-ID: <20251225021035.656639-4-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20251225021035.656639-1-chenxiaosong.chenxiaosong@linux.dev>
From: ChenXiaoSong <chenxiaosong@kylinos.cn>
Although the array is sorted at build time, verify the ordering again
when cifs.ko is loaded to avoid potential regressions introduced by
future script changes.
Suggested-by: David Howells <dhowells@redhat.com>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
fs/smb/client/cifsfs.c | 5 +++++
fs/smb/client/smb2maperror.c | 17 +++++++++++++++++
fs/smb/client/smb2proto.h | 1 +
3 files changed, 23 insertions(+)
diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index d9664634144d..b6646672799f 100644
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -1907,6 +1907,11 @@ static int __init
init_cifs(void)
{
int rc = 0;
+
+ rc = smb2_init_maperror();
+ if (rc)
+ return rc;
+
cifs_proc_init();
INIT_LIST_HEAD(&cifs_tcp_ses_list);
/*
diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c
index 573d74cd510d..3731e32c22a3 100644
--- a/fs/smb/client/smb2maperror.c
+++ b/fs/smb/client/smb2maperror.c
@@ -72,3 +72,20 @@ map_smb2_to_linux_error(char *buf, bool log_err)
smb_EIO1(smb_eio_trace_smb2_received_error, le32_to_cpu(smb2err));
return rc;
}
+
+int __init smb2_init_maperror(void)
+{
+ unsigned int i;
+
+ /* Check whether the array is sorted in ascending order */
+ for (i = 1; i < ARRAY_SIZE(smb2_error_map_table); i++) {
+ if (smb2_error_map_table[i].smb2_status >=
+ smb2_error_map_table[i - 1].smb2_status)
+ continue;
+
+ pr_err("smb2_error_map_table array order is incorrect\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h
index 063c9f83bbcd..cbaecbf4c205 100644
--- a/fs/smb/client/smb2proto.h
+++ b/fs/smb/client/smb2proto.h
@@ -23,6 +23,7 @@ struct smb_rqst;
*****************************************************************
*/
extern int map_smb2_to_linux_error(char *buf, bool log_err);
+int smb2_init_maperror(void);
extern int smb2_check_message(char *buf, unsigned int pdu_len, unsigned int length,
struct TCP_Server_Info *server);
extern unsigned int smb2_calc_size(void *buf);
--
2.43.0
next prev parent reply other threads:[~2025-12-25 2:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-25 2:10 [PATCH v6 0/5] smb: improve search speed of SMB2 maperror chenxiaosong.chenxiaosong
2025-12-25 2:10 ` [PATCH v6 1/5] cifs: Label SMB2 statuses with errors chenxiaosong.chenxiaosong
2025-12-25 2:10 ` [PATCH v6 2/5] cifs: Autogenerate SMB2 error mapping table chenxiaosong.chenxiaosong
2025-12-27 10:53 ` ChenXiaoSong
2025-12-27 12:00 ` David Howells
2025-12-27 15:03 ` ChenXiaoSong
2025-12-27 15:50 ` David Howells
2025-12-27 16:05 ` ChenXiaoSong
2025-12-30 9:42 ` ChenXiaoSong
2025-12-30 21:08 ` David Howells
2025-12-30 21:14 ` David Howells
2025-12-30 3:55 ` ChenXiaoSong
2025-12-30 9:07 ` David Howells
2025-12-25 2:10 ` chenxiaosong.chenxiaosong [this message]
2025-12-25 2:10 ` [PATCH v6 4/5] smb/client: use bsearch() to find target in smb2_error_map_table chenxiaosong.chenxiaosong
2025-12-26 11:58 ` David Howells
2025-12-26 12:06 ` David Howells
2025-12-26 15:28 ` ChenXiaoSong
2025-12-27 2:18 ` ChenXiaoSong
2025-12-27 8:56 ` David Howells
2025-12-27 9:29 ` ChenXiaoSong
2025-12-27 11:59 ` David Howells
2025-12-27 8:53 ` David Howells
2025-12-25 2:10 ` [PATCH v6 5/5] smb/client: introduce KUnit test to check search result of smb2_error_map_table chenxiaosong.chenxiaosong
2025-12-28 15:07 ` kernel test robot
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=20251225021035.656639-4-chenxiaosong.chenxiaosong@linux.dev \
--to=chenxiaosong.chenxiaosong@linux.dev \
--cc=bharathsm@microsoft.com \
--cc=chenxiaosong@kylinos.cn \
--cc=dhowells@redhat.com \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=pc@manguebit.org \
--cc=ronniesahlberg@gmail.com \
--cc=senozhatsky@chromium.org \
--cc=smfrench@gmail.com \
--cc=sprasad@microsoft.com \
--cc=tom@talpey.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