From: huiwen.he@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, chenxiaosong@kylinos.cn,
chenxiaosong@chenxiaosong.com, tangyouling@kylinos.cn
Cc: linux-cifs@vger.kernel.org
Subject: [PATCH v2 06/12] smb/client: check if ntstatus_to_dos_map is sorted
Date: Wed, 1 Apr 2026 07:29:06 +0000 [thread overview]
Message-ID: <20260401072912.355072-7-huiwen.he@linux.dev> (raw)
In-Reply-To: <20260401072912.355072-1-huiwen.he@linux.dev>
From: Youling Tang <tangyouling@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.
We are going to define 3 functions to check the sort results, introduce the
macro DEFINE_CHECK_SORT_FUNC() to reduce duplicate code.
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
Reviewed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
fs/smb/client/cifsfs.c | 6 ++++++
fs/smb/client/smb1maperror.c | 32 ++++++++++++++++++++++++++++++++
fs/smb/client/smb1proto.h | 1 +
3 files changed, 39 insertions(+)
diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index f4bed8d4a072..0541706c36c5 100644
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -1915,6 +1915,12 @@ init_cifs(void)
{
int rc = 0;
+#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
+ rc = smb1_init_maperror();
+ if (rc)
+ return rc;
+#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */
+
rc = smb2_init_maperror();
if (rc)
return rc;
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index fb985d2fc0d9..0a945f9bf8de 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -256,3 +256,35 @@ map_and_check_smb_error(struct TCP_Server_Info *server,
return rc;
}
+
+#define DEFINE_CHECK_SORT_FUNC(__array, __field) \
+static int __array ## _is_sorted(void) \
+{ \
+ unsigned int i; \
+ \
+ /* Check whether the array is sorted in ascending order */ \
+ for (i = 1; i < ARRAY_SIZE(__array); i++) { \
+ if (__array[i].__field >= \
+ __array[i - 1].__field) \
+ continue; \
+ \
+ pr_err(#__array " array order is incorrect\n"); \
+ return -EINVAL; \
+ } \
+ \
+ return 0; \
+}
+
+/* ntstatus_to_dos_map_is_sorted */
+DEFINE_CHECK_SORT_FUNC(ntstatus_to_dos_map, ntstatus);
+
+int __init smb1_init_maperror(void)
+{
+ int rc;
+
+ rc = ntstatus_to_dos_map_is_sorted();
+ if (rc)
+ return rc;
+
+ return rc;
+}
diff --git a/fs/smb/client/smb1proto.h b/fs/smb/client/smb1proto.h
index 42569bbcf6fd..dd98d04e837a 100644
--- a/fs/smb/client/smb1proto.h
+++ b/fs/smb/client/smb1proto.h
@@ -234,6 +234,7 @@ int cifs_verify_signature(struct smb_rqst *rqst,
* smb1maperror.c
*/
int map_smb_to_linux_error(char *buf, bool logErr);
+int smb1_init_maperror(void);
int map_and_check_smb_error(struct TCP_Server_Info *server,
struct mid_q_entry *mid, bool logErr);
--
2.52.0
next prev parent reply other threads:[~2026-04-01 7:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 7:29 [PATCH v2 00/12] smb: improve search speed of SMB1 maperror huiwen.he
2026-04-01 7:29 ` [PATCH v2 01/12] smb/client: annotate nterr.h with DOS error codes huiwen.he
2026-04-01 7:29 ` [PATCH v2 02/12] smb/client: autogenerate SMB1 NT status to DOS error mapping huiwen.he
2026-04-01 7:29 ` [PATCH v2 03/12] smb/client: replace nt_errs with ntstatus_to_dos_map huiwen.he
2026-04-01 7:29 ` [PATCH v2 04/12] smb/client: refactor ntstatus_to_dos() to return mapping entry huiwen.he
2026-04-01 7:29 ` [PATCH v2 05/12] smb/client: use binary search for NT status to DOS mapping huiwen.he
2026-04-01 7:29 ` huiwen.he [this message]
2026-04-01 7:29 ` [PATCH v2 07/12] smb/client: introduce KUnit test to check ntstatus_to_dos_map search huiwen.he
2026-04-01 7:29 ` [PATCH v2 08/12] smb/client: annotate smberr.h with POSIX error codes huiwen.he
2026-04-01 7:29 ` [PATCH v2 09/12] smb/client: autogenerate SMB1 DOS/SRV to POSIX error mapping huiwen.he
2026-04-01 7:29 ` [PATCH v2 10/12] smb/client: use binary search for SMB1 DOS/SRV " huiwen.he
2026-04-01 7:29 ` [PATCH v2 11/12] smb/client: check if SMB1 DOS/SRV error mapping arrays are sorted huiwen.he
2026-04-01 7:29 ` [PATCH v2 12/12] smb/client: introduce KUnit tests to check DOS/SRV err mapping search huiwen.he
2026-04-02 8:38 ` [PATCH v2 00/12] smb: improve search speed of SMB1 maperror 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=20260401072912.355072-7-huiwen.he@linux.dev \
--to=huiwen.he@linux.dev \
--cc=bharathsm@microsoft.com \
--cc=chenxiaosong@chenxiaosong.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=tangyouling@kylinos.cn \
--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.