[lvc-project] [PATCH 1/5] [v2] wifi: mwifiex: fix memory leak in mwifiex_histogram_read()

[Alexey Khoroshilov]

Если патчи 1,3,4,5 не менялись, то правильно было бы добавить в них

Acked-by: Brian Norris <briannorris at chromium.org>


Перепосылать из-за этого нет необходимости, просто на будущее.

Алексей


On 28.07.2023 11:43, Dmitry Antipov wrote:
> Always free the zeroed page on return from 'mwifiex_histogram_read()'.
>
> Fixes: cbf6e05527a7 ("mwifiex: add rx histogram statistics support")
> Signed-off-by: Dmitry Antipov <dmantipov at yandex.ru>
> ---
> v2: adjust to match series
> ---
>  drivers/net/wireless/marvell/mwifiex/debugfs.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c
> index 52b18f4a774b..0cdd6c50c1c0 100644
> --- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
> +++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
> @@ -253,8 +253,11 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,
>  	if (!p)
>  		return -ENOMEM;
>  
> -	if (!priv || !priv->hist_data)
> -		return -EFAULT;
> +	if (!priv || !priv->hist_data) {
> +		ret = -EFAULT;
> +		goto free_and_exit;
> +	}
> +
>  	phist_data = priv->hist_data;
>  
>  	p += sprintf(p, "\n"
> @@ -309,6 +312,8 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,
>  	ret = simple_read_from_buffer(ubuf, count, ppos, (char *)page,
>  				      (unsigned long)p - page);
>  
> +free_and_exit:
> +	free_page(page);
>  	return ret;
>  }
>