Attachment 16338 Details for Bug 14210 – git-am fix for 4.12.next, 4.13.next.

[patch] git-am fix for 4.12.next, 4.13.next.

0001-libcli-smb2-Never-print-length-if-smb2_signing_key_v.patch (text/plain), 1.95 KB, created by Jeremy Allison on 2020-11-16 17:06:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2020-11-16 17:06:41 UTC

Size: 1.95 KB

patch

obsolete

>From 8e6e5ee932966e9eeda42ce6c5432b0704d83dbc Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 13 Nov 2020 14:18:43 -0800
>Subject: [PATCH] libcli: smb2: Never print length if smb2_signing_key_valid()
> fails for crypto blob.
>
>Blob could be NULL.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14210
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Mon Nov 16 09:47:38 UTC 2020 on sn-devel-184
>
>(cherry picked from commit 26ba04a4d1987a859152751e6083d9b9aef770ff)
>---
> libcli/smb/smb2_signing.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
>index 623fc23fb18..cc03607d789 100644
>--- a/libcli/smb/smb2_signing.c
>+++ b/libcli/smb/smb2_signing.c
>@@ -92,8 +92,7 @@ NTSTATUS smb2_signing_sign_pdu(struct smb2_signing_key *signing_key,
> 	}
> 
> 	if (!smb2_signing_key_valid(signing_key)) {
>-		DBG_WARNING("Wrong session key length %zu for SMB2 signing\n",
>-			    signing_key->blob.length);
>+		DBG_WARNING("No signing key for SMB2 signing\n");
> 		return NT_STATUS_ACCESS_DENIED;
> 	}
> 
>@@ -416,8 +415,7 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
> 	tf = (uint8_t *)vector[0].iov_base;
> 
> 	if (!smb2_signing_key_valid(encryption_key)) {
>-		DBG_WARNING("Wrong encryption key length %zu for SMB2 signing\n",
>-			    encryption_key->blob.length);
>+		DBG_WARNING("No encryption key for SMB2 signing\n");
> 		return NT_STATUS_ACCESS_DENIED;
> 	}
> 
>@@ -613,8 +611,7 @@ NTSTATUS smb2_signing_decrypt_pdu(struct smb2_signing_key *decryption_key,
> 	tf = (uint8_t *)vector[0].iov_base;
> 
> 	if (!smb2_signing_key_valid(decryption_key)) {
>-		DBG_WARNING("Wrong decryption key length %zu for SMB2 signing\n",
>-			    decryption_key->blob.length);
>+		DBG_WARNING("No decryption key for SMB2 signing\n");
> 		return NT_STATUS_ACCESS_DENIED;
> 	}
> 
>-- 
>2.27.0
>

Flags:

vl: review+
jra: review? (metze)

Actions: View

Attachments on bug 14210: 15652 | 15653 | 15654 | 15655 | 16336 | 16337 | 16338