[SCM] Samba Shared Repository - branch v4-15-test updated

Jule Anger janger at samba.org
Wed Jan 12 14:27:01 UTC 2022


The branch, v4-15-test has been updated
       via  671dee2bd7d s3:smbd: Fix dereferencing null pointer "fsp"
      from  680f68a072c s3:modules: VFS CAP symlinkat always fails

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test


- Log -----------------------------------------------------------------
commit 671dee2bd7dce22835aff1920759ea726e381dc7
Author: Pavel Filipenský <pfilipen at redhat.com>
Date:   Fri Jan 7 21:18:59 2022 +0100

    s3:smbd: Fix dereferencing null pointer "fsp"
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14942
    
    Remove fsp which is always NULL and replace it with smb_fname->fsp.
    
    Found by covscan.
    
    Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 46460025175e83fbb47a510e412d83b1b2573db9)
    
    Autobuild-User(v4-15-test): Jule Anger <janger at samba.org>
    Autobuild-Date(v4-15-test): Wed Jan 12 14:27:00 UTC 2022 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/dosmode.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 027e04b1fa4..58fb0535c11 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -917,7 +917,6 @@ int file_set_dosmode(connection_struct *conn,
 	mode_t tmp;
 	mode_t unixmode;
 	int ret = -1, lret = -1;
-	files_struct *fsp = NULL;
 	NTSTATUS status;
 
 	if (!CAN_WRITE(conn)) {
@@ -1055,7 +1054,7 @@ int file_set_dosmode(connection_struct *conn,
 	}
 
 	become_root();
-	ret = SMB_VFS_FCHMOD(fsp, unixmode);
+	ret = SMB_VFS_FCHMOD(smb_fname->fsp, unixmode);
 	unbecome_root();
 
 	if (!newfile) {


-- 
Samba Shared Repository



More information about the samba-cvs mailing list