s3: smbd: When deleting an fsp pointer ensure we don't keep any references to it...
authorJeremy Allison <jra@samba.org>
Tue, 20 Jun 2017 18:20:38 +0000 (11:20 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 21 Jun 2017 22:12:49 +0000 (00:12 +0200)
Based on a suggestion from <lev@zadarastorage.com>

https://bugzilla.samba.org/show_bug.cgi?id=12818

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jun 22 00:12:49 CEST 2017 on sn-devel-144

source3/smbd/files.c

index 6d0f05b9db13e58b35368261ad3d62fc5a3ae129..303ab7bb92691a4bf6a888b0d9ea93d01beec360 100644 (file)
@@ -552,9 +552,7 @@ void file_free(struct smb_request *req, files_struct *fsp)
         * Clear all possible chained fsp
         * pointers in the SMB2 request queue.
         */
-       if (req != NULL && req->smb2req) {
-               remove_smb2_chained_fsp(fsp);
-       }
+       remove_smb2_chained_fsp(fsp);
 
        /* Drop all remaining extensions. */
        vfs_remove_all_fsp_extensions(fsp);