lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 067/757] cifs: Return the error from crypt_message when enc/dec key not found.
    Date
    From: Shyam Prasad N <sprasad@microsoft.com>

    commit 0bd294b55a5de442370c29fa53bab17aef3ff318 upstream.

    In crypt_message, when smb2_get_enc_key returns error, we need to
    return the error back to the caller. If not, we end up processing
    the message further, causing a kernel oops due to unwarranted access
    of memory.

    Call Trace:
    smb3_receive_transform+0x120/0x870 [cifs]
    cifs_demultiplex_thread+0xb53/0xc20 [cifs]
    ? cifs_handle_standard+0x190/0x190 [cifs]
    kthread+0x116/0x130
    ? kthread_park+0x80/0x80
    ret_from_fork+0x1f/0x30

    Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
    Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
    Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
    CC: Stable <stable@vger.kernel.org>
    Signed-off-by: Steve French <stfrench@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cifs/smb2ops.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/cifs/smb2ops.c
    +++ b/fs/cifs/smb2ops.c
    @@ -3924,7 +3924,7 @@ crypt_message(struct TCP_Server_Info *se
    if (rc) {
    cifs_server_dbg(VFS, "%s: Could not get %scryption key\n", __func__,
    enc ? "en" : "de");
    - return 0;
    + return rc;
    }

    rc = smb3_crypto_aead_allocate(server);

    \
     
     \ /
      Last update: 2020-10-27 16:40    [W:2.314 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site