[SCM] Samba Shared Repository - branch v4-1-test updated

[Karolin Seeger]

The branch, v4-1-test has been updated
       via  78240de VERSION: Set version to 4.1.0rc4.
       via  676b5de libcli: continue to read from the socket even if the size is 0
      from  a75cbcd s3: libsmb - 10150 - Not all OEM servers support the ALTNAME info level.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test


- Log -----------------------------------------------------------------
commit 78240de6a81d19e94f1953e15c61bd33f81e02ad
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Sep 20 09:45:04 2013 +0200

    VERSION: Set version to 4.1.0rc4.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Fri Sep 20 13:26:22 CEST 2013 on sn-devel-104

commit 676b5de4cfbdbbcb36277ed1c9594812c55b7e0a
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Sep 19 11:18:32 2013 -0700

    libcli: continue to read from the socket even if the size is 0
    
    This is an issue found by Codenomicon, with a malicious packet with 0
    bytes UDP payload we will continiously be looping trying to react from
    the socket event and continiously do nothing as we will bail out
    thinking that we had a memory allocation error.
    
    Original fix comes from Volker Lendecke <vl at samba.org>
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Fix bug #10158 - netbios related samba process consume 100% CPU.

-----------------------------------------------------------------------

Summary of changes:
 VERSION                            |    2 +-
 source4/libcli/dgram/dgramsocket.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 64306e2..a0b94a7 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=
+SAMBA_VERSION_RC_RELEASE=4
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 3f06dc7..cd6d3e4 100644
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -48,7 +48,7 @@ static void dgm_socket_recv(struct nbt_dgram_socket *dgmsock)
 	}
 
 	blob = data_blob_talloc(tmp_ctx, NULL, dsize);
-	if (blob.data == NULL) {
+	if ((dsize != 0) && (blob.data == NULL)) {
 		talloc_free(tmp_ctx);
 		return;
 	}


-- 
Samba Shared Repository