From: Noel Power Date: Mon, 25 Sep 2023 08:58:33 +0000 (+0100) Subject: s3/rpc_server: Fix dereference of client pointer X-Git-Tag: tdb-1.4.11~478 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0418b9fa929736a404b9ff976ff034009b913089;p=thirdparty%2Fsamba.git s3/rpc_server: Fix dereference of client pointer BUG: https://bugzilla.samba.org/show_bug.cgi?id=15465 Signed-off-by: Noel Power Reviewed-by: Jo Sutton --- diff --git a/selftest/knownfail.d/netlogon.admin b/selftest/knownfail.d/netlogon.admin deleted file mode 100644 index 054eefb3186..00000000000 --- a/selftest/knownfail.d/netlogon.admin +++ /dev/null @@ -1 +0,0 @@ -^samba3.rpc.netlogon.admin.admin.LogonControl2Ex.nt4_dc diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c index fa3e597fa8e..61471eadae0 100644 --- a/source3/rpc_server/netlogon/srv_netlog_nt.c +++ b/source3/rpc_server/netlogon/srv_netlog_nt.c @@ -197,7 +197,6 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p, struct netr_NETLOGON_INFO_1 *info1; struct netr_NETLOGON_INFO_2 *info2; struct netr_NETLOGON_INFO_3 *info3; - struct netr_NETLOGON_INFO_4 *info4; const char *fn; NTSTATUS status; struct netr_DsRGetDCNameInfo *dc_info; @@ -389,14 +388,10 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p, r->out.query->info3 = info3; break; case 4: - info4 = talloc_zero(p->mem_ctx, struct netr_NETLOGON_INFO_4); - W_ERROR_HAVE_NO_MEMORY(info4); - - info4->trusted_dc_name = dc_name; - info4->trusted_domain_name = r->in.data->domain; - - r->out.query->info4 = info4; - break; + if (r->in.function_code != NETLOGON_CONTROL_FIND_USER) { + return WERR_INVALID_PARAMETER; + } + return WERR_NOT_SUPPORTED; default: return WERR_INVALID_LEVEL; }