summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-09-23 21:44:24 -0700
committerJeremy Allison <jra@samba.org>2010-09-23 21:44:24 -0700
commitd8814b1a48adaf1f428c7119b97c87b69123e6fa (patch)
tree4b915160b408a5790000442b54567d7ab7de7b3a /source3/rpc_server
parent0a1d153b256e45d7862235ab0fdaa9e92ae883f2 (diff)
downloadsamba-d8814b1a48adaf1f428c7119b97c87b69123e6fa.tar.gz
samba-d8814b1a48adaf1f428c7119b97c87b69123e6fa.tar.bz2
samba-d8814b1a48adaf1f428c7119b97c87b69123e6fa.zip
Fix bug 7694 - Crash bug with invalid SPNEGO token.
Found by the CodeNomicon test suites at the SNIA plugfest. http://www.codenomicon.com/ If an invalid SPNEGO packet contains no OIDs we crash in the SMB1/SMB2 server as we indirect the first returned value OIDs[0], which is returned as NULL. Jeremy.
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/dcesrv_spnego.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/rpc_server/dcesrv_spnego.c b/source3/rpc_server/dcesrv_spnego.c
index 4686534a2e..fb758e338b 100644
--- a/source3/rpc_server/dcesrv_spnego.c
+++ b/source3/rpc_server/dcesrv_spnego.c
@@ -230,7 +230,7 @@ NTSTATUS spnego_server_auth_start(TALLOC_CTX *mem_ctx,
ret = spnego_parse_negTokenInit(sp_ctx, *spnego_in,
sp_ctx->oid_list, NULL, &token_in);
- if (!ret) {
+ if (!ret || sp_ctx->oid_list[0] == NULL) {
DEBUG(3, ("Invalid SPNEGO message\n"));
status = NT_STATUS_INVALID_PARAMETER;
goto done;