The branch, master has been updated
via 98461794359 smbd: Fix coverity#1646864 Move variable init code in
checked block
from 00a2b506a23 third_party: Update waf to version 2.1.6
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9846179435945ee3022cbbd47fcbe1a8cd061a63
Author: Vinit Agnihotri <[email protected]>
Date: Thu Jun 12 16:00:26 2025 +0530
smbd: Fix coverity#1646864 Move variable init code in checked block
xconn was getting dereference outside NULL check block, causing
'Dereference after null check' issue.
Fix moves offeding initialisation in NULL check blog.
Signed-off-by: Vinit Agnihotri <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Noel Power <[email protected]>
Autobuild-User(master): Anoop C S <[email protected]>
Autobuild-Date(master): Thu Jun 12 16:49:02 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_process.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index 829f6b4b11d..590c7f360d2 100644
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -771,12 +771,12 @@ bool init_smb1_request(struct smb_request *req,
if (NT_STATUS_IS_OK(status)) {
req->conn = tcon->compat;
}
- }
#if defined(WITH_SMB1SERVER)
- req->posix_pathnames = (xconn->smb1.unix_info.client_cap_low &
- CIFS_UNIX_POSIX_PATHNAMES_CAP) != 0;
+ req->posix_pathnames = (xconn->smb1.unix_info.client_cap_low &
+ CIFS_UNIX_POSIX_PATHNAMES_CAP) != 0;
#endif
+ }
/* Ensure we have at least wct words and 2 bytes of bcc. */
if (smb_size + req->wct*2 > req_size) {
--
Samba Shared Repository