diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-01-22 11:07:56 +1000 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-01-26 19:24:17 -0600 |
| commit | fe1292686333d1dadaf84091f585ee903b9ddb84 (patch) | |
| tree | 88ab712c9db2ed0b3c8efd46ec6c2e5800241cbe /fs/cifs | |
| parent | 643fbceef48e5b22bf8e0905f903e908b5d2ba69 (diff) | |
| download | lwn-fe1292686333d1dadaf84091f585ee903b9ddb84.tar.gz lwn-fe1292686333d1dadaf84091f585ee903b9ddb84.zip | |
cifs: fix NULL dereference in match_prepath
RHBZ: 1760879
Fix an oops in match_prepath() by making sure that the prepath string is not
NULL before we pass it into strcmp().
This is similar to other checks we make for example in cifs_root_iget()
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/connect.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 05ea0e2b7e0e..0aa3623ae0e1 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3709,8 +3709,10 @@ match_prepath(struct super_block *sb, struct cifs_mnt_data *mnt_data) { struct cifs_sb_info *old = CIFS_SB(sb); struct cifs_sb_info *new = mnt_data->cifs_sb; - bool old_set = old->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH; - bool new_set = new->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH; + bool old_set = (old->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH) && + old->prepath; + bool new_set = (new->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH) && + new->prepath; if (old_set && new_set && !strcmp(new->prepath, old->prepath)) return 1; |