Commit 2fe58d97 authored Jan 10, 2023 by Paulo Alcantara Committed by Steve French Jan 10, 2023

cifs: fix potential memory leaks in session setup



Make sure to free cifs_ses::auth_key.response before allocating it as
we might end up leaking memory in reconnect or mounting.

Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>

parent 22aeb01d

fs/cifs/cifsencrypt.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -278,6 +278,7 @@ build_avpair_blob(struct cifs_ses ses, const struct nls_table nls_cp)
	* ( for NTLMSSP_AV_NB_DOMAIN_NAME followed by NTLMSSP_AV_EOL ) +		* ( for NTLMSSP_AV_NB_DOMAIN_NAME followed by NTLMSSP_AV_EOL ) +
	* unicode length of a netbios domain name		* unicode length of a netbios domain name
	*/		*/
			kfree_sensitive(ses->auth_key.response);
	ses->auth_key.len = size + 2 * dlen;		ses->auth_key.len = size + 2 * dlen;
	ses->auth_key.response = kzalloc(ses->auth_key.len, GFP_KERNEL);		ses->auth_key.response = kzalloc(ses->auth_key.len, GFP_KERNEL);
	if (!ses->auth_key.response) {		if (!ses->auth_key.response) {

fs/cifs/sess.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -815,6 +815,7 @@ int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
	return -EINVAL;		return -EINVAL;
	}		}
	if (tilen) {		if (tilen) {
			kfree_sensitive(ses->auth_key.response);
	ses->auth_key.response = kmemdup(bcc_ptr + tioffset, tilen,		ses->auth_key.response = kmemdup(bcc_ptr + tioffset, tilen,
	GFP_KERNEL);		GFP_KERNEL);
	if (!ses->auth_key.response) {		if (!ses->auth_key.response) {
	@@ -1428,6 +1429,7 @@ sess_auth_kerberos(struct sess_data *sess_data)
	goto out_put_spnego_key;		goto out_put_spnego_key;
	}		}

			kfree_sensitive(ses->auth_key.response);
	ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len,		ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len,
	GFP_KERNEL);		GFP_KERNEL);
	if (!ses->auth_key.response) {		if (!ses->auth_key.response) {

fs/cifs/smb2pdu.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1453,6 +1453,7 @@ SMB2_auth_kerberos(struct SMB2_sess_data *sess_data)

	/* keep session key if binding */		/* keep session key if binding */
	if (!is_binding) {		if (!is_binding) {
			kfree_sensitive(ses->auth_key.response);
	ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len,		ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len,
	GFP_KERNEL);		GFP_KERNEL);
	if (!ses->auth_key.response) {		if (!ses->auth_key.response) {