The branch, v4-0-test has been updated
via 566e450 s4-dns: fix a warning
via 9178fb3 Fix bug #9214 - Bad user supplied SMB2 credit value can
cause smbd to call smb_panic.
from 56ffe75 waf: Build pam_smbpass module only if enabled.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 566e45049851212d7e7bfe98d3ae556210b07004
Author: Matthieu Patou <[email protected]>
Date: Wed Oct 3 00:37:34 2012 -0700
s4-dns: fix a warning
Fix bug #9240 - Dns server has a least a warning about unused variable.
Autobuild-User(v4-0-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-0-test): Mon Oct 8 14:28:38 CEST 2012 on sn-devel-104
commit 9178fb364c9c2b238257e8565e4adcb81c9b0611
Author: Jeremy Allison <[email protected]>
Date: Tue Oct 2 17:30:54 2012 -0700
Fix bug #9214 - Bad user supplied SMB2 credit value can cause smbd to call
smb_panic.
Terminate the connection cleanly instead.
(cherry picked from commit c2f5b2466bb05939c953341517da6d9df814b27c)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_server.c | 7 ++++++-
source4/dns_server/dns_server.c | 3 +--
2 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index dcaefb1..d92302e 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -780,7 +780,12 @@ static void smb2_set_operation_credit(struct
smbd_server_connection *sconn,
out_status = NT_STATUS(IVAL(outhdr, SMB2_HDR_STATUS));
SMB_ASSERT(sconn->smb2.max_credits >= sconn->smb2.credits_granted);
- SMB_ASSERT(sconn->smb2.max_credits >= credit_charge);
+
+ if (sconn->smb2.max_credits < credit_charge) {
+ smbd_server_connection_terminate(sconn,
+ "client error: credit charge > max credits\n");
+ return;
+ }
if (out_flags & SMB2_HDR_FLAG_ASYNC) {
/*
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 003dd4e..b768feb 100644
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -566,10 +566,9 @@ static void dns_udp_call_sendto_done(struct tevent_req
*subreq)
{
struct dns_udp_call *call = tevent_req_callback_data(subreq,
struct dns_udp_call);
- ssize_t ret;
int sys_errno;
- ret = tdgram_sendto_queue_recv(subreq, &sys_errno);
+ tdgram_sendto_queue_recv(subreq, &sys_errno);
/* We don't care about errors */
--
Samba Shared Repository
