The branch, master has been updated
via 6b89848 pam: Fix CID 1034871 Resource leak
via ad3e38f pam: Fix CID 1034870 Resource leak
via de1bf29 lib: Fix CID 1273073 Assign instead of compare
via 78fb663 smbd: Fix CID 1273088 Resource leak
via ddb84ef aio_fork: Fix CID 1273291 Uninitialized scalar variable
from 7be3a5f tevent: Ignore unexpected signal events in the same way the
epoll backend does.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6b898481afc7f2d20ca679632b516359e7afaf6a
Author: Volker Lendecke <v...@samba.org>
Date: Tue Mar 3 16:12:03 2015 +0100
pam: Fix CID 1034871 Resource leak
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
Autobuild-User(master): Ralph Böhme <s...@samba.org>
Autobuild-Date(master): Tue Mar 3 20:03:25 CET 2015 on sn-devel-104
commit ad3e38f6bb65fdf16cc792b97333a74d49f345bf
Author: Volker Lendecke <v...@samba.org>
Date: Tue Mar 3 16:11:26 2015 +0100
pam: Fix CID 1034870 Resource leak
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit de1bf29d250849ebea1a3badd3e881035c1897b0
Author: Volker Lendecke <v...@samba.org>
Date: Tue Mar 3 15:57:02 2015 +0100
lib: Fix CID 1273073 Assign instead of compare
This is a brown paper bag thingy, right?
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit 78fb663d4c29f9a226c26001492cbc7a9a701668
Author: Volker Lendecke <v...@samba.org>
Date: Tue Mar 3 15:53:34 2015 +0100
smbd: Fix CID 1273088 Resource leak
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit ddb84ef2d39524149ffe74d752993ca93547b9be
Author: Volker Lendecke <v...@samba.org>
Date: Tue Mar 3 15:48:46 2015 +0100
aio_fork: Fix CID 1273291 Uninitialized scalar variable
The previous code left msg.msg_flags uninitialized
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/close_low_fd.c | 2 +-
nsswitch/pam_winbind.c | 6 +++++-
source3/modules/vfs_aio_fork.c | 4 +---
source3/smbd/smb2_setinfo.c | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/close_low_fd.c b/lib/util/close_low_fd.c
index b11d25f..5e74918 100644
--- a/lib/util/close_low_fd.c
+++ b/lib/util/close_low_fd.c
@@ -28,7 +28,7 @@ _PUBLIC_ int close_low_fd(int fd)
dev_null = open("/dev/null", O_RDWR, 0);
- if ((dev_null == -1) && (errno = ENFILE)) {
+ if ((dev_null == -1) && (errno == ENFILE)) {
/*
* Try to free up an fd
*/
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index f1b88cb..1e16741 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -2436,6 +2436,7 @@ static char* winbind_upn_to_username(struct pwb_context
*ctx,
char *domain = NULL;
char *name;
char *p;
+ char *result;
/* This cannot work when the winbind separator = @ */
@@ -2467,7 +2468,10 @@ static char* winbind_upn_to_username(struct pwb_context
*ctx,
return NULL;
}
- return talloc_asprintf(ctx, "%s%c%s", domain, sep, name);
+ result = talloc_asprintf(ctx, "%s%c%s", domain, sep, name);
+ wbcFreeMemory(domain);
+ wbcFreeMemory(name);
+ return result;
}
static int _pam_delete_cred(pam_handle_t *pamh, int flags,
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index bf29dd1..06f38c2 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -203,15 +203,13 @@ static ssize_t read_fd(int fd, void *ptr, size_t nbytes,
int *recvfd)
static ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd)
{
- struct msghdr msg;
+ struct msghdr msg = {0};
size_t bufsize = msghdr_prep_fds(NULL, NULL, 0, &sendfd, 1);
uint8_t buf[bufsize];
struct iovec iov;
ssize_t sent;
msghdr_prep_fds(&msg, buf, bufsize, &sendfd, 1);
- msg.msg_name = NULL;
- msg.msg_namelen = 0;
iov.iov_base = (void *)ptr;
iov.iov_len = nbytes;
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index e6981d1..3f7bbec 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -474,6 +474,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX
*mem_ctx,
lck = get_existing_share_mode_lock(mem_ctx,
fsp->file_id);
if (lck == NULL) {
+ SAFE_FREE(data);
tevent_req_nterror(req,
NT_STATUS_UNSUCCESSFUL);
return tevent_req_post(req, ev);
--
Samba Shared Repository
