The branch, master has been updated
via 5259926de71 s4/torture/smb2: avoid possibly closing undefined handle
from 5d82af05f31 smbd: Remove a few "extern userdom_struct
current_user_info"
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5259926de71d9915f6152d99e20cce3920ba4aeb
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Tue Dec 13 10:11:17 2022 +1300
s4/torture/smb2: avoid possibly closing undefined handle
From OSS-Fuzz compilation:
Step #3 - "compile-honggfuzz-address-x86_64":
../../source4/torture/smb2/dir.c:1456:2: error: variable 'dir_handle' is used
uninitialized whenever 'if' condition is true
[-Werror,-Wsometimes-uninitialized]
Step #3 - "compile-honggfuzz-address-x86_64":
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
Step #3 - "compile-honggfuzz-address-x86_64":
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Step #3 - "compile-honggfuzz-address-x86_64":
../../lib/torture/torture.h:748:3: note: expanded from macro
'torture_assert_ntstatus_ok_goto'
Step #3 - "compile-honggfuzz-address-x86_64":
torture_assert_ntstatus_equal_goto(torture_ctx,expr,NT_STATUS_OK,ret,label,cmt)
Step #3 - "compile-honggfuzz-address-x86_64":
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Step #3 - "compile-honggfuzz-address-x86_64":
../../lib/torture/torture.h:316:6: note: expanded from macro
'torture_assert_ntstatus_equal_goto'
Step #3 - "compile-honggfuzz-address-x86_64": if
(!NT_STATUS_EQUAL(__got, __expected)) { \
Step #3 - "compile-honggfuzz-address-x86_64":
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Step #3 - "compile-honggfuzz-address-x86_64":
../../source4/torture/smb2/dir.c:1582:24: note: uninitialized use occurs here
Step #3 - "compile-honggfuzz-address-x86_64": smb2_util_close(tree,
dir_handle);
Step #3 - "compile-honggfuzz-address-x86_64":
^~~~~~~~~~
Step #3 - "compile-honggfuzz-address-x86_64":
../../source4/torture/smb2/dir.c:1456:2: note: remove the 'if' if its condition
is always false
Step #3 - "compile-honggfuzz-address-x86_64":
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
Step #3 - "compile-honggfuzz-address-x86_64": ^
Step #3 - "compile-honggfuzz-address-x86_64":
../../lib/torture/torture.h:748:3: note: expanded from macro
'torture_assert_ntstatus_ok_goto'
Step #3 - "compile-honggfuzz-address-x86_64":
torture_assert_ntstatus_equal_goto(torture_ctx,expr,NT_STATUS_OK,ret,label,cmt)
Step #3 - "compile-honggfuzz-address-x86_64": ^
Step #3 - "compile-honggfuzz-address-x86_64":
../../lib/torture/torture.h:316:2: note: expanded from macro
'torture_assert_ntstatus_equal_goto'
Step #3 - "compile-honggfuzz-address-x86_64": if
(!NT_STATUS_EQUAL(__got, __expected)) { \
Step #3 - "compile-honggfuzz-address-x86_64": ^
Step #3 - "compile-honggfuzz-address-x86_64":
../../source4/torture/smb2/dir.c:1434:2: note: variable 'dir_handle' is
declared here
Step #3 - "compile-honggfuzz-address-x86_64": struct smb2_handle
dir_handle;
Step #3 - "compile-honggfuzz-address-x86_64": ^
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Tue Dec 13 07:45:20 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
source4/torture/smb2/dir.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c
index 3acd655e366..049e208f02a 100644
--- a/source4/torture/smb2/dir.c
+++ b/source4/torture/smb2/dir.c
@@ -1453,8 +1453,8 @@ static bool test_1k_files_rename(struct torture_context
*tctx,
};
status = smb2_create(tree, tree, &dir);
- torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
- "Could not create test directory");
+ torture_assert_ntstatus_ok(tctx, status,
+ "Could not create test directory");
dir_handle = dir.out.file.handle;
--
Samba Shared Repository
