The branch, master has been updated
via e62ff6c unix_msg: Fix unix_dgram_send_queue_init
via 5f764be unix_msg: Fix CID 1372875 Double close
from 9f6015f ctdb-tests: Add new public IP takeover no-op test
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e62ff6c41da328ffd1948f128877ec4b8582fe45
Author: Volker Lendecke <v...@samba.org>
Date: Wed Sep 14 07:16:26 2016 +0200
unix_msg: Fix unix_dgram_send_queue_init
We should not free a DLIST element
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Böhme <s...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Wed Sep 14 19:30:28 CEST 2016 on sn-devel-144
commit 5f764be23d46194a63c81fa6743e555eebce1458
Author: Volker Lendecke <v...@samba.org>
Date: Wed Sep 14 07:13:38 2016 +0200
unix_msg: Fix CID 1372875 Double close
The two error callers of unix_dgram_sendq_schedule_free already run down the
sendq in the error case.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Böhme <s...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/unix_msg/unix_msg.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c
index 8645c97..5cbf428 100644
--- a/source3/lib/unix_msg/unix_msg.c
+++ b/source3/lib/unix_msg/unix_msg.c
@@ -414,14 +414,14 @@ static int unix_dgram_send_queue_init(
goto fail_close;
}
- DLIST_ADD(ctx->send_queues, q);
-
ret = unix_dgram_sendq_schedule_free(q);
if (ret != 0) {
err = ENOMEM;
goto fail_close;
}
+ DLIST_ADD(ctx->send_queues, q);
+
*result = q;
return 0;
@@ -470,7 +470,6 @@ static int unix_dgram_sendq_schedule_free(struct
unix_dgram_send_queue *q)
unix_dgram_sendq_scheduled_free_handler,
q);
if (q->timeout == NULL) {
- unix_dgram_send_queue_free(q);
return ENOMEM;
}
--
Samba Shared Repository
