The branch, master has been updated
via 2916301 ldap_server: Fix CID 1435721 Unchecked return value
via 3aae048 kdc: Fix CID 1435720 Unchecked return value
via 312faa0 ldap_server: Fix CID 1435731 Unchecked return value
via c8b4f31 ctdbd: Fix CID 1435732 Argument cannot be negative
via 8b013aa audit_logging: Fix CID 1435739 Dereference null return value
via ca01643 ctdb: Fix CID 1435740 Unchecked return value
from 0e11fab autobuild: Include information of disk free in
system-info.txt
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 291630126d3358c22bc88d98e5e35c274e6af29d
Author: Volker Lendecke <v...@samba.org>
Date: Tue May 22 17:10:07 2018 +0200
ldap_server: Fix CID 1435721 Unchecked return value
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu May 24 03:35:00 CEST 2018 on sn-devel-144
commit 3aae048a43b1987eb2e60de988a8d4c180bfd6f6
Author: Volker Lendecke <v...@samba.org>
Date: Tue May 22 17:08:43 2018 +0200
kdc: Fix CID 1435720 Unchecked return value
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 312faa0b82b9aca6ebd205921266859aa531d94b
Author: Volker Lendecke <v...@samba.org>
Date: Tue May 22 13:25:41 2018 +0200
ldap_server: Fix CID 1435731 Unchecked return value
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit c8b4f31105bdbc3186c310eb2535af30f7c00c62
Author: Volker Lendecke <v...@samba.org>
Date: Tue May 22 13:23:33 2018 +0200
ctdbd: Fix CID 1435732 Argument cannot be negative
setenv returns its error in "errno"
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 8b013aa31bf8942fcc46f75d5ffdbcbebf8e7b1b
Author: Volker Lendecke <v...@samba.org>
Date: Tue May 22 13:20:17 2018 +0200
audit_logging: Fix CID 1435739 Dereference null return value
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit ca01643c92a2f96268a39ac27ba2b1ed3422dede
Author: Volker Lendecke <v...@samba.org>
Date: Tue May 22 13:17:25 2018 +0200
ctdb: Fix CID 1435740 Unchecked return value
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdbd.c | 2 +-
ctdb/tests/src/cluster_wait.c | 9 ++++++++-
lib/audit_logging/tests/audit_logging_test.c | 1 +
source4/kdc/kdc-proxy.c | 12 ++++++++++--
source4/ldap_server/ldap_server.c | 27 +++++++++++++++++++++------
5 files changed, 41 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 252309cc..5290165 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -307,7 +307,7 @@ int main(int argc, const char *argv[])
1);
if (ret != 0) {
D_ERR("Failed to set up lock debugging (%s)\n",
- strerror(ret));
+ strerror(errno));
goto fail;
}
}
diff --git a/ctdb/tests/src/cluster_wait.c b/ctdb/tests/src/cluster_wait.c
index ecd2efd..8b0bb42 100644
--- a/ctdb/tests/src/cluster_wait.c
+++ b/ctdb/tests/src/cluster_wait.c
@@ -58,6 +58,7 @@ struct tevent_req *cluster_wait_send(TALLOC_CTX *mem_ctx,
{
struct tevent_req *req, *subreq;
struct cluster_wait_state *state;
+ bool ok;
req = tevent_req_create(mem_ctx, &state, struct cluster_wait_state);
if (req == NULL) {
@@ -95,7 +96,13 @@ struct tevent_req *cluster_wait_send(TALLOC_CTX *mem_ctx,
tevent_req_set_callback(subreq, cluster_wait_sync_registered, req);
/* If cluster is not synchronized within 30 seconds, time out */
- tevent_req_set_endtime(req, ev, tevent_timeval_current_ofs(30, 0));
+ ok = tevent_req_set_endtime(
+ req,
+ ev,
+ tevent_timeval_current_ofs(30, 0));
+ if (!ok) {
+ return tevent_req_post(req, ev);
+ }
return req;
}
diff --git a/lib/audit_logging/tests/audit_logging_test.c
b/lib/audit_logging/tests/audit_logging_test.c
index 9ba71fb..8385e9c 100644
--- a/lib/audit_logging/tests/audit_logging_test.c
+++ b/lib/audit_logging/tests/audit_logging_test.c
@@ -519,6 +519,7 @@ static void test_audit_get_timestamp(void **state)
struct tm tz;
c = strptime(c, " %Z", &tz);
}
+ assert_non_null(c);
assert_int_equal(0, strlen(c));
actual = mktime(&tm);
diff --git a/source4/kdc/kdc-proxy.c b/source4/kdc/kdc-proxy.c
index 5072835..0f84906 100644
--- a/source4/kdc/kdc-proxy.c
+++ b/source4/kdc/kdc-proxy.c
@@ -184,6 +184,7 @@ static void kdc_udp_proxy_resolve_done(struct
composite_context *csubreq)
struct tevent_req *subreq;
struct tsocket_address *local_addr, *proxy_addr;
int ret;
+ bool ok;
status = resolve_name_recv(csubreq, state, &state->proxy.ip);
if (!NT_STATUS_IS_OK(status)) {
@@ -234,8 +235,15 @@ static void kdc_udp_proxy_resolve_done(struct
composite_context *csubreq)
return;
}
tevent_req_set_callback(subreq, kdc_udp_proxy_recvfrom_done, req);
- tevent_req_set_endtime(subreq, state->ev,
- timeval_current_ofs(state->kdc->proxy_timeout,
0));
+
+ ok = tevent_req_set_endtime(
+ subreq,
+ state->ev,
+ timeval_current_ofs(state->kdc->proxy_timeout, 0));
+ if (!ok) {
+ DBG_DEBUG("tevent_req_set_endtime failed\n");
+ return;
+ }
DEBUG(4,("kdc_udp_proxy: proxying request to %s[%s]\n",
state->proxy.name.name, state->proxy.ip));
diff --git a/source4/ldap_server/ldap_server.c
b/source4/ldap_server/ldap_server.c
index 80b8c19..b5251e3 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -104,6 +104,7 @@ static void ldapsrv_terminate_connection_done(struct
tevent_req *subreq)
tevent_req_callback_data(subreq,
struct ldapsrv_connection);
int sys_errno;
+ bool ok;
tstream_disconnect_recv(subreq, &sys_errno);
TALLOC_FREE(subreq);
@@ -130,9 +131,15 @@ static void ldapsrv_terminate_connection_done(struct
tevent_req *subreq)
conn->limits.reason);
return;
}
- tevent_req_set_endtime(subreq,
- conn->connection->event.ctx,
- conn->limits.endtime);
+ ok = tevent_req_set_endtime(subreq,
+ conn->connection->event.ctx,
+ conn->limits.endtime);
+ if (!ok) {
+ TALLOC_FREE(conn->sockets.raw);
+ stream_terminate_connection(conn->connection,
+ conn->limits.reason);
+ return;
+ }
tevent_req_set_callback(subreq, ldapsrv_terminate_connection_done,
conn);
}
@@ -494,9 +501,17 @@ static bool ldapsrv_call_read_next(struct
ldapsrv_connection *conn)
return false;
}
if (!timeval_is_zero(&conn->limits.endtime)) {
- tevent_req_set_endtime(subreq,
- conn->connection->event.ctx,
- conn->limits.endtime);
+ bool ok;
+ ok = tevent_req_set_endtime(subreq,
+ conn->connection->event.ctx,
+ conn->limits.endtime);
+ if (!ok) {
+ ldapsrv_terminate_connection(
+ conn,
+ "ldapsrv_call_read_next: "
+ "no memory for tevent_req_set_endtime");
+ return false;
+ }
}
tevent_req_set_callback(subreq, ldapsrv_call_read_done, conn);
conn->sockets.read_req = subreq;
--
Samba Shared Repository
