The branch, master has been updated via e8081af winbind: Fix CID 1035545 Uninitialized scalar variable via 4b54bb9 winbind: Fix CID 1035544 Uninitialized scalar variable via 009cf61 smbd: Fix CID 703870 Uninitialized scalar variable via bfbaf51 ping_pong: Fix CID 1273087 Resource leak via 19b28ee lib: Fix CID 1034836 Resource leak via 607301a lib: Fix a typo from 704592c Last lot of convert uint32 to uint32_t in winbindd, I promise.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e8081af2c79f96aa1755ae0ec775864a7fc3445c Author: Volker Lendecke <v...@samba.org> Date: Sun May 3 09:20:42 2015 +0000 winbind: Fix CID 1035545 Uninitialized scalar variable In rpc_sequence_number() we always look at *pseq Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ira Cooper <i...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Wed May 6 18:24:01 CEST 2015 on sn-devel-104 commit 4b54bb9024af4b37e45edb9874d410de85b3758b Author: Volker Lendecke <v...@samba.org> Date: Sun May 3 09:20:42 2015 +0000 winbind: Fix CID 1035544 Uninitialized scalar variable In rpc_sequence_number() we always look at *pseq Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ira Cooper <i...@samba.org> commit 009cf612c83cd2edc9bc592e25533801128f1922 Author: Volker Lendecke <v...@samba.org> Date: Sun May 3 09:27:16 2015 +0000 smbd: Fix CID 703870 Uninitialized scalar variable msg.msg_flags was uninitialized in the recvmsg call Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ira Cooper <i...@samba.org> commit bfbaf51cd627b2d1052dd23be4b0df5e004cc92f Author: Volker Lendecke <v...@samba.org> Date: Sun May 3 09:34:41 2015 +0000 ping_pong: Fix CID 1273087 Resource leak Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ira Cooper <i...@samba.org> commit 19b28ee82868e52e200d52fe19456826e5ade7e4 Author: Volker Lendecke <v...@samba.org> Date: Sun May 3 09:45:33 2015 +0000 lib: Fix CID 1034836 Resource leak Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ira Cooper <i...@samba.org> commit 607301a8434e18b20e6bdc5dee0e063c00bdca95 Author: Volker Lendecke <v...@samba.org> Date: Sun May 3 10:12:23 2015 +0000 lib: Fix a typo Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ira Cooper <i...@samba.org> ----------------------------------------------------------------------- Summary of changes: ctdb/utils/ping_pong/ping_pong.c | 1 + lib/replace/test/testsuite.c | 4 ++++ source3/lib/util_str.c | 2 +- source3/modules/vfs_aio_fork.c | 7 +------ source3/winbindd/winbindd_msrpc.c | 2 +- source3/winbindd/winbindd_samr.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/utils/ping_pong/ping_pong.c b/ctdb/utils/ping_pong/ping_pong.c index 1d134a1..fdb575d 100644 --- a/ctdb/utils/ping_pong/ping_pong.c +++ b/ctdb/utils/ping_pong/ping_pong.c @@ -141,6 +141,7 @@ static void ping_pong(int fd, int num_locks) val = (unsigned char *)calloc(num_locks+1, sizeof(unsigned char)); if (val == NULL) { printf("calloc failed\n"); + munmap(p, num_locks+1); return; } diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c index 017b8ed..961b77d 100644 --- a/lib/replace/test/testsuite.c +++ b/lib/replace/test/testsuite.c @@ -69,19 +69,23 @@ static int test_ftruncate(void) } if (ftruncate(fd, size) != 0) { printf("failure: ftruncate [\n%s\n]\n", strerror(errno)); + close(fd); return false; } if (fstat(fd, &st) != 0) { printf("failure: ftruncate [\nfstat failed - %s\n]\n", strerror(errno)); + close(fd); return false; } if (st.st_size != size) { printf("failure: ftruncate [\ngave wrong size %d - expected %d\n]\n", (int)st.st_size, size); + close(fd); return false; } unlink(TESTFILE); printf("success: ftruncate\n"); + close(fd); return true; } diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index a2d5997..fc87802 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -566,7 +566,7 @@ bool strupper_m(char *s) if (!*s) return true; - /* I assume that lowercased string takes the same number of bytes + /* I assume that uppercased string takes the same number of bytes * as source string even in multibyte encoding. (VIV) */ len = strlen(s) + 1; ret = unix_strupper(s,len,s,len); diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 06f38c2..dea8107 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -154,21 +154,16 @@ static void free_aio_children(void **p) static ssize_t read_fd(int fd, void *ptr, size_t nbytes, int *recvfd) { - struct msghdr msg; struct iovec iov[1]; + struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 1 }; ssize_t n; size_t bufsize = msghdr_prep_recv_fds(NULL, NULL, 0, 1); uint8_t buf[bufsize]; msghdr_prep_recv_fds(&msg, buf, bufsize, 1); - msg.msg_name = NULL; - msg.msg_namelen = 0; - iov[0].iov_base = (void *)ptr; iov[0].iov_len = nbytes; - msg.msg_iov = iov; - msg.msg_iovlen = 1; do { n = recvmsg(fd, &msg, 0); diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c index 7cd904b..4080b12 100644 --- a/source3/winbindd/winbindd_msrpc.c +++ b/source3/winbindd/winbindd_msrpc.c @@ -862,7 +862,7 @@ static NTSTATUS msrpc_sequence_number(struct winbindd_domain *domain, { struct rpc_pipe_client *samr_pipe; struct policy_handle dom_pol; - uint32_t seq; + uint32_t seq = DOM_SEQUENCE_NONE; TALLOC_CTX *tmp_ctx; NTSTATUS status; diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c index b94dfc8..3d0914a 100644 --- a/source3/winbindd/winbindd_samr.c +++ b/source3/winbindd/winbindd_samr.c @@ -983,7 +983,7 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain, { struct rpc_pipe_client *samr_pipe; struct policy_handle dom_pol; - uint32_t seq; + uint32_t seq = DOM_SEQUENCE_NONE; TALLOC_CTX *tmp_ctx; NTSTATUS status, result; struct dcerpc_binding_handle *b = NULL; -- Samba Shared Repository