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

Commit 9a178494 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Greg Kroah-Hartman
Browse files

cifs: fix NULL dereference in match_prepath 



[ Upstream commit fe1292686333d1dadaf84091f585ee903b9ddb84 ]

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: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9c5ede11

fs/cifs/connect.c

+4 −2
Original line number Diff line number Diff line
@@ -3652,8 +3652,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;