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

Commit 97f4b727 authored by Aurelien Aptel's avatar Aurelien Aptel Committed by Steve French
Browse files

CIFS: zero sensitive data when freeing 



also replaces memset()+kfree() by kzfree().

Signed-off-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Cc: <stable@vger.kernel.org>
parent 2026b06e

fs/cifs/cifsencrypt.c

+1 −2
Original line number Diff line number Diff line
@@ -325,9 +325,8 @@ int calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt, 
{

	int i;

	int rc;

	char password_with_pad[CIFS_ENCPWD_SIZE];

	char password_with_pad[CIFS_ENCPWD_SIZE] = {0};



	memset(password_with_pad, 0, CIFS_ENCPWD_SIZE);

	if (password)

		strncpy(password_with_pad, password, CIFS_ENCPWD_SIZE);

fs/cifs/connect.c

+3 −3
Original line number Diff line number Diff line
@@ -1720,7 +1720,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			tmp_end++;

			if (!(tmp_end < end && tmp_end[1] == delim)) {

				/* No it is not. Set the password to NULL */

				kfree(vol->password);

				kzfree(vol->password);

				vol->password = NULL;

				break;

			}
@@ -1758,7 +1758,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
					options = end;

			}



			kfree(vol->password);

			kzfree(vol->password);

			/* Now build new password string */

			temp_len = strlen(value);

			vol->password = kzalloc(temp_len+1, GFP_KERNEL);
@@ -4356,7 +4356,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid) 
		reset_cifs_unix_caps(0, tcon, NULL, vol_info);

out:

	kfree(vol_info->username);

	kfree(vol_info->password);

	kzfree(vol_info->password);

	kfree(vol_info);



	return tcon;

fs/cifs/misc.c

+4 −10
Original line number Diff line number Diff line
@@ -98,14 +98,11 @@ sesInfoFree(struct cifs_ses *buf_to_free) 
	kfree(buf_to_free->serverOS);

	kfree(buf_to_free->serverDomain);

	kfree(buf_to_free->serverNOS);

	if (buf_to_free->password) {

		memset(buf_to_free->password, 0, strlen(buf_to_free->password));

		kfree(buf_to_free->password);

	}

	kzfree(buf_to_free->password);

	kfree(buf_to_free->user_name);

	kfree(buf_to_free->domainName);

	kfree(buf_to_free->auth_key.response);

	kfree(buf_to_free);

	kzfree(buf_to_free->auth_key.response);

	kzfree(buf_to_free);

}



struct cifs_tcon *
@@ -136,10 +133,7 @@ tconInfoFree(struct cifs_tcon *buf_to_free) 
	}

	atomic_dec(&tconInfoAllocCount);

	kfree(buf_to_free->nativeFileSystem);

	if (buf_to_free->password) {

		memset(buf_to_free->password, 0, strlen(buf_to_free->password));

		kfree(buf_to_free->password);

	}

	kzfree(buf_to_free->password);

	kfree(buf_to_free);

}