diff options
| author | Steve French <stfrench@microsoft.com> | 2020-02-04 22:02:59 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-02-05 15:32:19 +0300 |
| commit | 87f93d82e0952da18af4d978e7d887b4c5326c0b (patch) | |
| tree | a72e97199d9fbad3c709c34bd33dcffc9292e86b /fs/cifs | |
| parent | 0f060936e490c6279dfe773d75d526d3d3d77111 (diff) | |
| download | linux-87f93d82e0952da18af4d978e7d887b4c5326c0b.tar.xz | |
smb3: fix problem with null cifs super block with previous patch
Add check for null cifs_sb to create_options helper
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifsproto.h | 2 | ||||
| -rw-r--r-- | fs/cifs/smb2ops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 748bd00cb5f1..89eaaf46d1ca 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -614,7 +614,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; diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 33bb86cae369..ac6628e28b12 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -2407,7 +2407,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; |