[SCM] Samba Shared Repository - branch v3-6-test updated

Jeremy Allison jra at samba.org
Mon Sep 27 19:26:55 MDT 2010

The branch, v3-6-test has been updated
       via  5710476 tsocket: make sure we delete the fd event before calling close()
      from  53526de Add torture test BAD-NBT-SESSION as regression fix for bug 7698 - Assert causes smbd to panic on invalid NetBIOS session request.


- Log -----------------------------------------------------------------
commit 57104760c0152b909772952ed83ec150340d43a0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Sep 27 23:57:34 2010 +0200

    tsocket: make sure we delete the fd event before calling close()
    We got random double free errors, when getting events from
    epoll_wait() and try to dereference the private talloc pointer
    attached to it.
    Before doing the close() in the tstream_disconnect_send() function
    we need to delete the fd event.
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Sep 28 01:02:55 UTC 2010 on sn-devel-104
    (cherry picked from commit 38f505530ba06323a56c7d3914630efffcd12629)


Summary of changes:
 lib/tsocket/tsocket_bsd.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index dfc9685..88f97e2 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -1107,6 +1107,7 @@ static struct tevent_req *tdgram_bsd_disconnect_send(TALLOC_CTX *mem_ctx,
 		goto post;
+	TALLOC_FREE(bsds->fde);
 	ret = close(bsds->fd);
 	bsds->fd = -1;
 	err = tsocket_bsd_error_from_errno(ret, errno, &dummy);

Samba Shared Repository

More information about the samba-cvs mailing list