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

Commit 9d822a94 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: set pointers to NULL after kfree"

parents 9aa7f8ac febf4856

sound/soc/msm/msm-cpe-lsm.c

+8 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2015, Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2016, Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1208,6 +1208,7 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream, 
			dev_err(rtd->dev, "%s: No memory for sound model\n",

				__func__);

			kfree(session->conf_levels);

			session->conf_levels = NULL;

			return -ENOMEM;

		}

		session->snd_model_size = snd_model.data_size;
@@ -1219,6 +1220,8 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream, 
				__func__);

			kfree(session->conf_levels);

			kfree(session->snd_model_data);

			session->conf_levels = NULL;

			session->snd_model_data = NULL;

			return -EFAULT;

		}
@@ -1230,6 +1233,8 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream, 
			       __func__, rc);

			kfree(session->snd_model_data);

			kfree(session->conf_levels);

			session->snd_model_data = NULL;

			session->conf_levels = NULL;

			return rc;

		}
@@ -1243,6 +1248,8 @@ static int msm_cpe_lsm_ioctl_shared(struct snd_pcm_substream *substream, 
			lsm_ops->lsm_shmem_dealloc(cpe->core_handle, session);

			kfree(session->snd_model_data);

			kfree(session->conf_levels);

			session->snd_model_data = NULL;

			session->conf_levels = NULL;

			return rc;

		}

sound/soc/msm/qdsp6v2/msm-dai-slim.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -467,7 +467,9 @@ static void msm_dai_slim_remove_dai_data( 
		dai_data_t = &drv_data->slim_dai_data[i];



		kfree(dai_data_t->chan_h);

		dai_data_t->chan_h = NULL;

		kfree(dai_data_t->sh_ch);

		dai_data_t->sh_ch = NULL;

	}

}

sound/soc/msm/qdsp6v2/q6lsm.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2015, Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2016, Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -348,6 +348,7 @@ void q6lsm_client_free(struct lsm_client *client) 
	q6lsm_mmap_apr_dereg();

	mutex_destroy(&client->cmd_lock);

	kfree(client);

	client = NULL;

}



/*