Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 387236b9 authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

smb3: fix problem with null cifs super block with previous patch 



commit 87f93d82e0952da18af4d978e7d887b4c5326c0b upstream.

Add check for null cifs_sb to create_options helper

Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarPratyush Yadav <ptyadav@amazon.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e64d7b1

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses, 


static inline int cifs_create_options(struct cifs_sb_info *cifs_sb, int options)

{

	if (backup_cred(cifs_sb))

	if (cifs_sb && (backup_cred(cifs_sb)))

		return options | CREATE_OPEN_BACKUP_INTENT;

	else

		return options;

fs/cifs/smb2ops.c

+1 −1
Original line number Diff line number Diff line
@@ -2343,7 +2343,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, 
				      FS_FULL_SIZE_INFORMATION,

				      SMB2_O_INFO_FILESYSTEM,

				      sizeof(struct smb2_fs_full_size_info),

				      &rsp_iov, &buftype, NULL);

				      &rsp_iov, &buftype, cifs_sb);

	if (rc)

		goto qfs_exit;