From 2558252a6fc918cfe5e9bdfc0d7b98a1324ab61b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 16 Aug 2019 14:15:45 +1200 Subject: [PATCH 096/187] s4-rpc_server: Check NTSTATUS return value from netlogon_creds_aes_decrypt() Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider (cherry picked from commit 1e427f55d71350b25a8a26e94a5cb7895d8efdf6) --- source4/rpc_server/netlogon/dcerpc_netlogon.c | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index ac745e32b02..49a075137ff 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -747,14 +747,17 @@ static NTSTATUS dcesrv_netr_ServerPasswordSet2(struct dcesrv_call_state *dce_cal SIVAL(password_buf.data, 512, r->in.new_password->length); if (creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) { - netlogon_creds_aes_decrypt(creds, password_buf.data, 516); + nt_status = netlogon_creds_aes_decrypt(creds, + password_buf.data, + 516); } else { nt_status = netlogon_creds_arcfour_crypt(creds, password_buf.data, 516); - if (!NT_STATUS_IS_OK(nt_status)) { - return nt_status; - } + } + + if (!NT_STATUS_IS_OK(nt_status)) { + return nt_status; } switch (creds->secure_channel_type) { @@ -2803,14 +2806,16 @@ static NTSTATUS dcesrv_netr_NetrLogonSendToSam(struct dcesrv_call_state *dce_cal /* Buffer is meant to be 16-bit aligned */ if (creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) { - netlogon_creds_aes_decrypt(creds, r->in.opaque_buffer, r->in.buffer_len); + nt_status = netlogon_creds_aes_decrypt(creds, + r->in.opaque_buffer, + r->in.buffer_len); } else { nt_status = netlogon_creds_arcfour_crypt(creds, r->in.opaque_buffer, r->in.buffer_len); - if (!NT_STATUS_IS_OK(nt_status)) { - return nt_status; - } + } + if (!NT_STATUS_IS_OK(nt_status)) { + return nt_status; } decrypted_blob.data = r->in.opaque_buffer; -- 2.23.0