From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Navid Emamdoost <navid.emamdoost@gmail.com>
Cc: emamd001@umn.edu, kjlu@umn.edu, smccaman@umn.edu,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Wei Yongjun <weiyongjun1@huawei.com>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ASoC: SOF: Fix memory leak in sof_dfsentry_write
Date: Sun, 27 Oct 2019 20:47:42 -0500 [thread overview]
Message-ID: <4d08ed12-48fa-ed7f-3988-8d040c64acb1@linux.intel.com> (raw)
In-Reply-To: <20191027194856.4056-1-navid.emamdoost@gmail.com>
On 10/27/19 2:48 PM, Navid Emamdoost wrote:
> In the implementation of sof_dfsentry_write() memory allocated for
> string is leaked in case of an error. Go to error handling path if the
> d_name.name is not valid.
>
> Fixes: 091c12e1f50c ("ASoC: SOF: debug: add new debugfs entries for IPC flood test")
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> sound/soc/sof/debug.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
> index 54cd431faab7..5529e8eeca46 100644
> --- a/sound/soc/sof/debug.c
> +++ b/sound/soc/sof/debug.c
> @@ -152,8 +152,10 @@ static ssize_t sof_dfsentry_write(struct file *file, const char __user *buffer,
> */
> dentry = file->f_path.dentry;
> if (strcmp(dentry->d_name.name, "ipc_flood_count") &&
> - strcmp(dentry->d_name.name, "ipc_flood_duration_ms"))
> - return -EINVAL;
> + strcmp(dentry->d_name.name, "ipc_flood_duration_ms")) {
> + ret = -EINVAL;
> + goto out;
> + }
>
> if (!strcmp(dentry->d_name.name, "ipc_flood_duration_ms"))
> flood_duration_test = true;
>
WARNING: multiple messages have this Message-ID (diff)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Navid Emamdoost <navid.emamdoost@gmail.com>
Cc: alsa-devel@alsa-project.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Takashi Iwai <tiwai@suse.com>,
kjlu@umn.edu, Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Wei Yongjun <weiyongjun1@huawei.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
smccaman@umn.edu, linux-kernel@vger.kernel.org, emamd001@umn.edu
Subject: Re: [alsa-devel] [PATCH] ASoC: SOF: Fix memory leak in sof_dfsentry_write
Date: Sun, 27 Oct 2019 20:47:42 -0500 [thread overview]
Message-ID: <4d08ed12-48fa-ed7f-3988-8d040c64acb1@linux.intel.com> (raw)
In-Reply-To: <20191027194856.4056-1-navid.emamdoost@gmail.com>
On 10/27/19 2:48 PM, Navid Emamdoost wrote:
> In the implementation of sof_dfsentry_write() memory allocated for
> string is leaked in case of an error. Go to error handling path if the
> d_name.name is not valid.
>
> Fixes: 091c12e1f50c ("ASoC: SOF: debug: add new debugfs entries for IPC flood test")
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> ---
> sound/soc/sof/debug.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
> index 54cd431faab7..5529e8eeca46 100644
> --- a/sound/soc/sof/debug.c
> +++ b/sound/soc/sof/debug.c
> @@ -152,8 +152,10 @@ static ssize_t sof_dfsentry_write(struct file *file, const char __user *buffer,
> */
> dentry = file->f_path.dentry;
> if (strcmp(dentry->d_name.name, "ipc_flood_count") &&
> - strcmp(dentry->d_name.name, "ipc_flood_duration_ms"))
> - return -EINVAL;
> + strcmp(dentry->d_name.name, "ipc_flood_duration_ms")) {
> + ret = -EINVAL;
> + goto out;
> + }
>
> if (!strcmp(dentry->d_name.name, "ipc_flood_duration_ms"))
> flood_duration_test = true;
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-10-28 1:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 19:48 [PATCH] ASoC: SOF: Fix memory leak in sof_dfsentry_write Navid Emamdoost
2019-10-27 19:48 ` [alsa-devel] " Navid Emamdoost
2019-10-28 1:47 ` Pierre-Louis Bossart [this message]
2019-10-28 1:47 ` Pierre-Louis Bossart
2019-10-28 14:56 ` Applied "ASoC: SOF: Fix memory leak in sof_dfsentry_write" to the asoc tree Mark Brown
2019-10-28 14:56 ` [alsa-devel] " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4d08ed12-48fa-ed7f-3988-8d040c64acb1@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=emamd001@umn.edu \
--cc=gregkh@linuxfoundation.org \
--cc=kjlu@umn.edu \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=navid.emamdoost@gmail.com \
--cc=perex@perex.cz \
--cc=ranjani.sridharan@linux.intel.com \
--cc=smccaman@umn.edu \
--cc=tiwai@suse.com \
--cc=weiyongjun1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.