[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Aug 21 08:40:03 UTC 2019
The branch, master has been updated
via 1b599e5c0d0 s3: net: net_ads: fix a typo in comment
via fc4ad5b6dfd talloc: ASAN fix for test_magic_protection
via d0933ec62c1 talloc: ASAN fix for test_rusty
via 6c3e8a0a9f0 talloc: ASAN fix for test_pool_nest
via 878e804df63 talloc: ASAN fix for test_talloc_free_in_destructor
via 616646a0c4c talloc: ASAN fix for test_realloc_on_destructor_parent
from f42642e54e5 s3: VFS: Complete the replacement of SMB_VFS_LINK() -> SMB_VFS_LINKAT().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1b599e5c0d076f49b8debc35f6888a7612d69599
Author: Marco Wang <m.aesophor at gmail.com>
Date: Wed Aug 14 14:05:05 2019 +0800
s3: net: net_ads: fix a typo in comment
Signed-off-by: Marco Wang <m.aesophor at gmail.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Aug 21 08:39:43 UTC 2019 on sn-devel-184
commit fc4ad5b6dfdcfb859f92dcca868a043e31a051b0
Author: Swen Schillig <swen at linux.ibm.com>
Date: Thu Aug 15 14:43:22 2019 +0200
talloc: ASAN fix for test_magic_protection
Direct leak of 1152 byte(s) in 1 object(s) allocated from:
#0 0x7f06393dfc08 in __interceptor_malloc (/lib64/libasan.so.5+0xefc08)
#1 0x7f06392cfd59 in __talloc_with_prefix ../../talloc.c:782
#2 0x7f06392cfd59 in _talloc_pool ../../talloc.c:837
#3 0x7f06392cfd59 in talloc_pool ../../talloc.c:859
#4 0x40b83c in test_magic_protection ../../testsuite.c:1960
#5 0x40b83c in torture_local_talloc ../../testsuite.c:2164
#6 0x402603 in main ../../testsuite_main.c:32
#7 0x7f063908a412 in __libc_start_main (/lib64/libc.so.6+0x24412)
Signed-off-by: Swen Schillig <swen at linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Matthias Dieter Wallnöfer <mdw at samba.org>
commit d0933ec62c113a6da5209a556fad8819febe4ec2
Author: Swen Schillig <swen at linux.ibm.com>
Date: Thu Aug 15 14:39:58 2019 +0200
talloc: ASAN fix for test_rusty
Direct leak of 100 byte(s) in 1 object(s) allocated from:
#0 0x7f06393dfc08 in __interceptor_malloc (/lib64/libasan.so.5+0xefc08)
#1 0x7f06392d1af3 in __talloc_with_prefix ../../talloc.c:782
#2 0x7f06392d1af3 in __talloc ../../talloc.c:824
#3 0x7f06392d1af3 in __talloc_strlendup ../../talloc.c:2455
#4 0x7f06392d1af3 in talloc_strdup ../../talloc.c:2471
#5 0x40b4f0 in test_rusty ../../testsuite.c:1543
#6 0x40b4f0 in torture_local_talloc ../../testsuite.c:2146
#7 0x402603 in main ../../testsuite_main.c:32
#8 0x7f063908a412 in __libc_start_main (/lib64/libc.so.6+0x24412)
Signed-off-by: Swen Schillig <swen at linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Matthias Dieter Wallnöfer <mdw at samba.org>
commit 6c3e8a0a9f0636467af5678c04d5aecc9c3dbf7a
Author: Swen Schillig <swen at linux.ibm.com>
Date: Thu Aug 15 14:36:59 2019 +0200
talloc: ASAN fix for test_pool_nest
Direct leak of 96 byte(s) in 1 object(s) allocated from:
#0 0x7f06393dfc08 in __interceptor_malloc (/lib64/libasan.so.5+0xefc08)
#1 0x7f06392d0c45 in __talloc_with_prefix ../../talloc.c:782
#2 0x7f06392d0c45 in __talloc ../../talloc.c:824
#3 0x7f06392d0c45 in _talloc_named_const ../../talloc.c:981
#4 0x7f06392d0c45 in talloc_named_const ../../talloc.c:1748
#5 0x40901e in test_pool_nest ../../testsuite.c:1451
#6 0x40901e in torture_local_talloc ../../testsuite.c:2096
#7 0x402603 in main ../../testsuite_main.c:32
#8 0x7f063908a412 in __libc_start_main (/lib64/libc.so.6+0x24412)
Signed-off-by: Swen Schillig <swen at linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Matthias Dieter Wallnöfer <mdw at samba.org>
commit 878e804df6377ffa120ae62b9abb182c957c10a6
Author: Swen Schillig <swen at linux.ibm.com>
Date: Thu Aug 15 14:33:32 2019 +0200
talloc: ASAN fix for test_talloc_free_in_destructor
Indirect leak of 104 byte(s) in 1 object(s) allocated from:
#0 0x7f06393dfc08 in __interceptor_malloc (/lib64/libasan.so.5+0xefc08)
#1 0x7f06392d0c45 in __talloc_with_prefix ../../talloc.c:782
#2 0x7f06392d0c45 in __talloc ../../talloc.c:824
#3 0x7f06392d0c45 in _talloc_named_const ../../talloc.c:981
#4 0x7f06392d0c45 in talloc_named_const ../../talloc.c:1748
#5 0x409edd in test_talloc_free_in_destructor ../../testsuite.c:1256
#6 0x409edd in torture_local_talloc ../../testsuite.c:2138
#7 0x402603 in main ../../testsuite_main.c:32
#8 0x7f063908a412 in __libc_start_main (/lib64/libc.so.6+0x24412)
Signed-off-by: Swen Schillig <swen at linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Matthias Dieter Wallnöfer <mdw at samba.org>
commit 616646a0c4c5709ab334a11907642e710f912697
Author: Swen Schillig <swen at linux.ibm.com>
Date: Thu Aug 15 14:22:46 2019 +0200
talloc: ASAN fix for test_realloc_on_destructor_parent
Direct leak of 96 byte(s) in 1 object(s) allocated from:
#0 0x7fd52c00dc08 in __interceptor_malloc (/lib64/libasan.so.5+0xefc08)
#1 0x7fd52befec45 in __talloc_with_prefix ../../talloc.c:782
#2 0x7fd52befec45 in __talloc ../../talloc.c:824
#3 0x7fd52befec45 in _talloc_named_const ../../talloc.c:981
#4 0x7fd52befec45 in talloc_named_const ../../talloc.c:1748
#5 0x4099bd in test_realloc_on_destructor_parent ../../testsuite.c:1000
#6 0x4099bd in torture_local_talloc ../../testsuite.c:2129
#7 0x402603 in main ../../testsuite_main.c:32
#8 0x7fd52bcb8412 in __libc_start_main (/lib64/libc.so.6+0x24412)
Signed-off-by: Swen Schillig <swen at linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Matthias Dieter Wallnöfer <mdw at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/testsuite.c | 12 +++++++++++-
source3/utils/net_ads.c | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index a76a64716c8..aa5c771ea31 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -1035,6 +1035,8 @@ static bool test_realloc_on_destructor_parent(void)
printf("success: free_for_exit\n");
+ talloc_free(top); /* make ASAN happy */
+
return true;
}
@@ -1264,6 +1266,8 @@ static bool test_talloc_free_in_destructor(void)
talloc_free(level0);
+ talloc_free(level3); /* make ASAN happy */
+
printf("success: free_in_destructor\n");
return true;
}
@@ -1464,6 +1468,8 @@ static bool test_pool_nest(void)
talloc_free(p1);
+ talloc_free(e); /* make ASAN happy */
+
return true;
}
@@ -1534,7 +1540,7 @@ static bool test_free_ref_null_context(void)
static bool test_rusty(void)
{
void *root;
- const char *p1;
+ char *p1;
talloc_enable_null_tracking();
root = talloc_new(NULL);
@@ -1543,6 +1549,8 @@ static bool test_rusty(void)
talloc_report_full(root, stdout);
talloc_free(root);
CHECK_BLOCKS("null_context", NULL, 2);
+ talloc_free(p1); /* make ASAN happy */
+
return true;
}
@@ -1991,6 +1999,8 @@ static bool test_magic_protection(void)
while (wait(&exit_status) != pid);
+ talloc_free(pool); /* make ASAN happy */
+
if (!WIFEXITED(exit_status)) {
printf("Child exited through unexpected abnormal means\n");
return false;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 6b4cd3591b0..913fbbf0bf8 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1470,7 +1470,7 @@ int net_ads_testjoin(struct net_context *c, int argc, const char **argv)
}
/*******************************************************************
- Simple configu checks before beginning the join
+ Simple config checks before beginning the join
********************************************************************/
static WERROR check_ads_config( void )
--
Samba Shared Repository
More information about the samba-cvs
mailing list