linux-kernel - Re: [PATCH v4 09/10] smb/client: update some SMB2 status strings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAH2r5mtrVo4FMd-fwhJ8FKovage=429AWU6TeyB5RkpZtzBA1g@mail.gmail.com>
Date: Sun, 7 Dec 2025 11:47:47 -0600
From: Steve French <smfrench@...il.com>
To: chenxiaosong.chenxiaosong@...ux.dev
Cc: linkinjeon@...nel.org, linkinjeon@...ba.org, linux-cifs@...r.kernel.org, 
	linux-kernel@...r.kernel.org, liuzhengyuan@...inos.cn, huhai@...inos.cn, 
	liuyun01@...inos.cn, ChenXiaoSong <chenxiaosong@...inos.cn>
Subject: Re: [PATCH v4 09/10] smb/client: update some SMB2 status strings

Good catch - merged into cifs-2.6.git for-next

On Sat, Dec 6, 2025 at 9:20 AM <chenxiaosong.chenxiaosong@...ux.dev> wrote:
>
> From: ChenXiaoSong <chenxiaosong@...inos.cn>
>
> The smb2maperror KUnit tests reported the following errors:
>
>   KTAP version 1
>   1..1
>       KTAP version 1
>       # Subtest: smb2_maperror
>       # module: cifs
>       1..2
>       ok 1 maperror_test_check_sort
>       # maperror_test_check_search: EXPECTATION FAILED at fs/smb/client/smb2maperror_test.c:40
>       Expected expect->status_string == result->status_string, but
>           expect->status_string == "STATUS_ABANDONED_WAIT_0"
>           result->status_string == "STATUS_ABANDONED"
>       # maperror_test_check_search: EXPECTATION FAILED at fs/smb/client/smb2maperror_test.c:40
>       Expected expect->status_string == result->status_string, but
>           expect->status_string == "STATUS_FWP_TOO_MANY_CALLOUTS"
>           result->status_string == "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS"
>       not ok 2 maperror_test_check_search
>   # smb2_maperror: pass:1 fail:1 skip:0 total:2
>   # Totals: pass:1 fail:1 skip:0 total:2
>   not ok 1 smb2_maperror
>
> These status codes have duplicate values, so update the status strings to
> make the log messages more explicit.
>
> Signed-off-by: ChenXiaoSong <chenxiaosong@...inos.cn>
> ---
>  fs/smb/client/smb2maperror.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c
> index dc2edeafc93b..e54b5871ecc9 100644
> --- a/fs/smb/client/smb2maperror.c
> +++ b/fs/smb/client/smb2maperror.c
> @@ -22,8 +22,9 @@ static struct status_to_posix_error smb2_error_map_table[] = {
>         {STATUS_WAIT_2, -EIO, "STATUS_WAIT_2"},
>         {STATUS_WAIT_3, -EIO, "STATUS_WAIT_3"},
>         {STATUS_WAIT_63, -EIO, "STATUS_WAIT_63"},
> -       {STATUS_ABANDONED, -EIO, "STATUS_ABANDONED"},
> -       {STATUS_ABANDONED_WAIT_0, -EIO, "STATUS_ABANDONED_WAIT_0"},
> +       {STATUS_ABANDONED, -EIO, "STATUS_ABANDONED or STATUS_ABANDONED_WAIT_0"},
> +       {STATUS_ABANDONED_WAIT_0, -EIO,
> +       "STATUS_ABANDONED or STATUS_ABANDONED_WAIT_0"},
>         {STATUS_ABANDONED_WAIT_63, -EIO, "STATUS_ABANDONED_WAIT_63"},
>         {STATUS_USER_APC, -EIO, "STATUS_USER_APC"},
>         {STATUS_KERNEL_APC, -EIO, "STATUS_KERNEL_APC"},
> @@ -2292,8 +2293,9 @@ static struct status_to_posix_error smb2_error_map_table[] = {
>         {STATUS_FWP_LIFETIME_MISMATCH, -EIO, "STATUS_FWP_LIFETIME_MISMATCH"},
>         {STATUS_FWP_BUILTIN_OBJECT, -EIO, "STATUS_FWP_BUILTIN_OBJECT"},
>         {STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS, -EIO,
> -       "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS"},
> -       {STATUS_FWP_TOO_MANY_CALLOUTS, -EIO, "STATUS_FWP_TOO_MANY_CALLOUTS"},
> +       "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"},
> +       {STATUS_FWP_TOO_MANY_CALLOUTS, -EIO,
> +       "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"},
>         {STATUS_FWP_NOTIFICATION_DROPPED, -EIO,
>         "STATUS_FWP_NOTIFICATION_DROPPED"},
>         {STATUS_FWP_TRAFFIC_MISMATCH, -EIO, "STATUS_FWP_TRAFFIC_MISMATCH"},
> --
> 2.43.0
>


-- 
Thanks,

Steve