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 v5 3/5] smb/client: check whether smb2_error_map_table is sorted in ascending order
Date: Wed, 24 Dec 2025 10:31:42 +0800 [thread overview]
Message-ID: <20251224023145.608165-4-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20251224023145.608165-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 | 19 +++++++++++++++++++
fs/smb/client/smb2proto.h | 1 +
3 files changed, 25 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..d96448cacf0a 100644
--- a/fs/smb/client/smb2maperror.c
+++ b/fs/smb/client/smb2maperror.c
@@ -27,6 +27,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
#include "smb2_mapping_table.c"
};
+static unsigned int err_map_num = ARRAY_SIZE(smb2_error_map_table);
+
int
map_smb2_to_linux_error(char *buf, bool log_err)
{
@@ -72,3 +74,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 smb2_init_maperror(void)
+{
+ unsigned int i;
+
+ /* Check whether the array is sorted in ascending order */
+ for (i = 1; i < err_map_num; 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..95f4413aee42 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);
+extern 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-24 2:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-24 2:31 [PATCH v5 0/5] smb: improve search speed of SMB2 maperror chenxiaosong.chenxiaosong
2025-12-24 2:31 ` [PATCH v5 1/5] cifs: Label SMB2 statuses with errors chenxiaosong.chenxiaosong
2025-12-24 2:31 ` [PATCH v5 2/5] cifs: Autogenerate SMB2 error mapping table chenxiaosong.chenxiaosong
2025-12-24 2:31 ` chenxiaosong.chenxiaosong [this message]
2025-12-24 8:10 ` [PATCH v5 3/5] smb/client: check whether smb2_error_map_table is sorted in ascending order David Howells
2025-12-24 2:31 ` [PATCH v5 4/5] smb/client: use bsearch() to find target in smb2_error_map_table chenxiaosong.chenxiaosong
2025-12-24 8:17 ` David Howells
2025-12-24 2:31 ` [PATCH v5 5/5] smb/client: introduce KUnit test to check search result of smb2_error_map_table chenxiaosong.chenxiaosong
2025-12-24 8:22 ` David Howells
2025-12-24 8:54 ` ChenXiaoSong
2025-12-24 15:08 ` ChenXiaoSong
[not found] ` <CAH2r5mu604z2DSdfYYaCoRJ16AdCdUdmNUDYEAU4Z5mXttEFSA@mail.gmail.com>
2025-12-24 15:29 ` ChenXiaoSong
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=20251224023145.608165-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.