linux-kernel - Re: [PATCH] cifs: fix check of rc in function generate

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <CAH2r5mvSXmRx8j65hLZEpiHOs-72zDpUYF-uy4reR3R3vUzfZA@mail.gmail.com>
Date:   Mon, 13 Nov 2023 16:23:11 -0600
From:   Steve French <smfrench@...il.com>
To:     Ekaterina Esina <eesina@...ralinux.ru>
Cc:     Steve French <sfrench@...ba.org>,
        Paulo Alcantara <pc@...guebit.com>,
        Ronnie Sahlberg <lsahlber@...hat.com>,
        Shyam Prasad N <sprasad@...rosoft.com>,
        Tom Talpey <tom@...pey.com>, Aurelien Aptel <aaptel@...e.com>,
        linux-cifs@...r.kernel.org, samba-technical@...ts.samba.org,
        linux-kernel@...r.kernel.org, lvc-project@...uxtesting.org,
        Anastasia Belova <abelova@...ralinux.ru>
Subject: Re: [PATCH] cifs: fix check of rc in function generate_smb3signingkey

tentatively merged into cifs-2.6.git for-next pending testing

On Mon, Nov 13, 2023 at 10:43 AM Ekaterina Esina <eesina@...ralinux.ru> wrote:
>
> Remove extra check after condition, add check after generating key
> for encryption. The check is needed to return non zero rc before
> rewriting it with generating key for decryption.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: d70e9fa55884 ("cifs: try opening channels after mounting")
> Signed-off-by: Ekaterina Esina <eesina@...ralinux.ru>
> Co-developed-by: Anastasia Belova <abelova@...ralinux.ru>
> Signed-off-by: Anastasia Belova <abelova@...ralinux.ru>
> ---
>  fs/smb/client/smb2transport.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/smb/client/smb2transport.c b/fs/smb/client/smb2transport.c
> index 84ea67301303..5a3ca62d2f07 100644
> --- a/fs/smb/client/smb2transport.c
> +++ b/fs/smb/client/smb2transport.c
> @@ -458,6 +458,8 @@ generate_smb3signingkey(struct cifs_ses *ses,
>                                   ptriplet->encryption.context,
>                                   ses->smb3encryptionkey,
>                                   SMB3_ENC_DEC_KEY_SIZE);
> +               if (rc)
> +                       return rc;
>                 rc = generate_key(ses, ptriplet->decryption.label,
>                                   ptriplet->decryption.context,
>                                   ses->smb3decryptionkey,
> @@ -466,9 +468,6 @@ generate_smb3signingkey(struct cifs_ses *ses,
>                         return rc;
>         }
>
> -       if (rc)
> -               return rc;
> -
>  #ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS
>         cifs_dbg(VFS, "%s: dumping generated AES session keys\n", __func__);
>         /*
> --
> 2.30.2
>
>


-- 
Thanks,

Steve