52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 9f6f1e01aca4f00a5d23127803c81939253e0577 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Wed, 12 Oct 2022 13:57:42 +1300
|
|
Subject: [PATCH 10/15] CVE-2022-3437 source4/heimdal: Don't pass NULL pointers
|
|
to memcpy() in DES unwrap
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15134
|
|
|
|
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
|
Conflict: NA
|
|
Reference: https://download.samba.org/pub/samba/patches/security/samba-4.15.11-security-2022-10-25.patch
|
|
---
|
|
source4/heimdal/lib/gssapi/krb5/unwrap.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/source4/heimdal/lib/gssapi/krb5/unwrap.c b/source4/heimdal/lib/gssapi/krb5/unwrap.c
|
|
index 7111a7944fe..9639091cb3a 100644
|
|
--- a/source4/heimdal/lib/gssapi/krb5/unwrap.c
|
|
+++ b/source4/heimdal/lib/gssapi/krb5/unwrap.c
|
|
@@ -180,9 +180,10 @@ unwrap_des
|
|
output_message_buffer->value = malloc(output_message_buffer->length);
|
|
if(output_message_buffer->length != 0 && output_message_buffer->value == NULL)
|
|
return GSS_S_FAILURE;
|
|
- memcpy (output_message_buffer->value,
|
|
- p + 24,
|
|
- output_message_buffer->length);
|
|
+ if (output_message_buffer->value != NULL)
|
|
+ memcpy (output_message_buffer->value,
|
|
+ p + 24,
|
|
+ output_message_buffer->length);
|
|
return GSS_S_COMPLETE;
|
|
}
|
|
#endif
|
|
@@ -374,9 +375,10 @@ unwrap_des3
|
|
output_message_buffer->value = malloc(output_message_buffer->length);
|
|
if(output_message_buffer->length != 0 && output_message_buffer->value == NULL)
|
|
return GSS_S_FAILURE;
|
|
- memcpy (output_message_buffer->value,
|
|
- p + 36,
|
|
- output_message_buffer->length);
|
|
+ if (output_message_buffer->value != NULL)
|
|
+ memcpy (output_message_buffer->value,
|
|
+ p + 36,
|
|
+ output_message_buffer->length);
|
|
return GSS_S_COMPLETE;
|
|
}
|
|
|
|
--
|
|
2.25.1
|