* [SMB3][PATCH] Fix oops in cifs_create_options()
@ 2020-02-04 20:42 Steve French
2020-02-05 10:55 ` Aurélien Aptel
0 siblings, 1 reply; 2+ messages in thread
From: Steve French @ 2020-02-04 20:42 UTC (permalink / raw)
To: CIFS; +Cc: Amir Goldstein
[-- Attachment #1: Type: text/plain, Size: 19 bytes --]
--
Thanks,
Steve
[-- Attachment #2: 0001-smb3-fix-problem-with-null-cifs-super-block-with-pre.patch --]
[-- Type: text/x-patch, Size: 1431 bytes --]
From 67299c469b718200ca88bf74ad6106ef2b8ed7b4 Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Tue, 4 Feb 2020 13:02:59 -0600
Subject: [PATCH] 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>
CC: Amir Goldstein <amir73il@gmail.com>
---
fs/cifs/cifsproto.h | 2 +-
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;
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [SMB3][PATCH] Fix oops in cifs_create_options()
2020-02-04 20:42 [SMB3][PATCH] Fix oops in cifs_create_options() Steve French
@ 2020-02-05 10:55 ` Aurélien Aptel
0 siblings, 0 replies; 2+ messages in thread
From: Aurélien Aptel @ 2020-02-05 10:55 UTC (permalink / raw)
To: Steve French, CIFS; +Cc: Amir Goldstein
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
--
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-05 10:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 20:42 [SMB3][PATCH] Fix oops in cifs_create_options() Steve French
2020-02-05 10:55 ` Aurélien Aptel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).