The branch, master has been updated
via f16908c winbind: Fix CID 1398530 Resource leak
via e8008fb winbind: Fix CID 1398530 Resource leak
via 24a8193 winbind: Fix CID 1398531 Resource leak
via 5f024a0 winbind: Fix CID 1398533 Resource leak
via 4495535 winbind: Fix CID 1398533 Resource leak
via 3a864fc s3/smb2_read: Better fallback for incorrectly configured
sendfile setups
from e84e44c messaging: Fix dead but not cleaned-up-yet destination
sockets
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f16908c454e4350d9b3a321ea78d345f7c7bfd55
Author: Volker Lendecke <[email protected]>
Date: Tue Jan 10 13:29:38 2017 +0000
winbind: Fix CID 1398530 Resource leak
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Wed Jan 11 04:38:25 CET 2017 on sn-devel-144
commit e8008fb36d7821eafffc5f0ff2ee6f080f84c4ae
Author: Volker Lendecke <[email protected]>
Date: Tue Jan 10 13:28:41 2017 +0000
winbind: Fix CID 1398530 Resource leak
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 24a81937d009a3079d75e3bab6e46eae35fc797f
Author: Volker Lendecke <[email protected]>
Date: Tue Jan 10 13:24:22 2017 +0000
winbind: Fix CID 1398531 Resource leak
Not really a leak due to talloc, but this way it's clear
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 5f024a0079cf5b762eafe68264fa2599f33666b7
Author: Volker Lendecke <[email protected]>
Date: Tue Jan 10 13:26:13 2017 +0000
winbind: Fix CID 1398533 Resource leak
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 4495535cb55afe254a6bd15df1121e14ad7ad054
Author: Volker Lendecke <[email protected]>
Date: Tue Jan 10 13:24:22 2017 +0000
winbind: Fix CID 1398533 Resource leak
Not really a leak due to talloc, but this way it's clear
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 3a864fc952edaa96d2ee20254a3e9c90d29fe28c
Author: Anoop C S <[email protected]>
Date: Tue Jan 10 13:30:30 2017 +0000
s3/smb2_read: Better fallback for incorrectly configured sendfile setups
When "use sendfile" is enabled but not supported by the underlying VFS
module then fallback to normal copy and print out a warning for the
admin.
Pair-Programmed-With: Guenther Deschner <[email protected]>
Pair-Programmed-With: Michael Adam <[email protected]>
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_read.c | 7 +++++++
source3/winbindd/winbindd_ads.c | 5 +++--
source3/winbindd/winbindd_cache.c | 1 +
source3/winbindd/winbindd_msrpc.c | 1 +
source3/winbindd/winbindd_rpc.c | 1 +
source3/winbindd/winbindd_samr.c | 1 +
6 files changed, 14 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 89527f3..1c85840 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -221,6 +221,13 @@ static int smb2_sendfile_send_data(struct
smbd_smb2_read_state *state)
goto normal_read;
}
+ if (errno == ENOTSUP) {
+ set_use_sendfile(SNUM(fsp->conn), false);
+ DBG_WARNING("Disabling sendfile use as sendfile is "
+ "not supported by the system\n");
+ goto normal_read;
+ }
+
if (errno == EINTR) {
/*
* Special hack for broken Linux with no working
sendfile. If we
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 8357968..b14f21e 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -356,8 +356,9 @@ static NTSTATUS query_user_list(struct winbindd_domain
*domain,
}
if (!ads_pull_sid(ads, msg, "objectSid", &user_sid)) {
- DBG_INFO("No sid for %s !?\n",
- ads_get_dn(ads, talloc_tos(), msg));
+ char *dn = ads_get_dn(ads, talloc_tos(), msg);
+ DBG_INFO("No sid for %s !?\n", dn);
+ TALLOC_FREE(dn);
continue;
}
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index d92c050..4431cb5 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -1457,6 +1457,7 @@ do_fetch_cache:
rids = talloc_array(mem_ctx, uint32_t, num_rids);
if (rids == NULL) {
+ centry_free(centry);
return NT_STATUS_NO_MEMORY;
}
diff --git a/source3/winbindd/winbindd_msrpc.c
b/source3/winbindd/winbindd_msrpc.c
index 4b742c4..0d0e4ca 100644
--- a/source3/winbindd/winbindd_msrpc.c
+++ b/source3/winbindd/winbindd_msrpc.c
@@ -90,6 +90,7 @@ static NTSTATUS msrpc_query_user_list(struct winbindd_domain
*domain,
}
done:
+ TALLOC_FREE(rids);
TALLOC_FREE(tmp_ctx);
return status;
}
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index bb8af45..fcc6366 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -77,6 +77,7 @@ NTSTATUS rpc_query_user_list(TALLOC_CTX *mem_ctx,
}
if (!NT_STATUS_IS_OK(result)) {
if (!NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
+ TALLOC_FREE(rids);
return result;
}
}
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index dd67496..224f105 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -208,6 +208,7 @@ done:
dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
}
+ TALLOC_FREE(rids);
TALLOC_FREE(tmp_ctx);
return status;
}
--
Samba Shared Repository
