On Wed, 2014-05-07 at 11:53 +0300, Andy Shevchenko wrote:
> When we fail to allocate memory for thread->srcs or thread->dsts and src_cnt or
> dst_cnt great than 1 we leak memory on error path. This patch fixes the issue.
> As a side effect we allocate the exact number of soruce and destination
> buffers.
Dan, ping?
Like you asked I split patch series to two and fixed one minor
checkpatch.pl warning. Any comments?
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/dma/dmatest.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
> index 740013d..d490c0f 100644
> --- a/drivers/dma/dmatest.c
> +++ b/drivers/dma/dmatest.c
> @@ -441,7 +441,7 @@ static int dmatest_func(void *data)
> src_cnt = min_odd(params->pq_sources | 1, dma_maxpq(dev, 0));
> dst_cnt = 2;
>
> - pq_coefs = kmalloc(params->pq_sources+1, GFP_KERNEL);
> + pq_coefs = kmalloc(params->pq_sources + 1, GFP_KERNEL);
> if (!pq_coefs)
> goto err_thread_type;
>
> @@ -450,7 +450,7 @@ static int dmatest_func(void *data)
> } else
> goto err_thread_type;
>
> - thread->srcs = kcalloc(src_cnt+1, sizeof(u8 *), GFP_KERNEL);
> + thread->srcs = kcalloc(src_cnt, sizeof(u8 *), GFP_KERNEL);
> if (!thread->srcs)
> goto err_srcs;
> for (i = 0; i < src_cnt; i++) {
> @@ -458,9 +458,8 @@ static int dmatest_func(void *data)
> if (!thread->srcs[i])
> goto err_srcbuf;
> }
> - thread->srcs[i] = NULL;
>
> - thread->dsts = kcalloc(dst_cnt+1, sizeof(u8 *), GFP_KERNEL);
> + thread->dsts = kcalloc(dst_cnt, sizeof(u8 *), GFP_KERNEL);
> if (!thread->dsts)
> goto err_dsts;
> for (i = 0; i < dst_cnt; i++) {
> @@ -468,7 +467,6 @@ static int dmatest_func(void *data)
> if (!thread->dsts[i])
> goto err_dstbuf;
> }
> - thread->dsts[i] = NULL;
>
> set_user_nice(current, 10);
>
> @@ -751,14 +749,17 @@ static int dmatest_func(void *data)
> runtime = ktime_us_delta(ktime_get(), ktime);
>
> ret = 0;
> - for (i = 0; thread->dsts[i]; i++)
> - kfree(thread->dsts[i]);
> +
> + i = dst_cnt;
> err_dstbuf:
> + while (--i >= 0)
> + kfree(thread->dsts[i]);
> kfree(thread->dsts);
> err_dsts:
> - for (i = 0; thread->srcs[i]; i++)
> - kfree(thread->srcs[i]);
> + i = src_cnt;
> err_srcbuf:
> + while (--i >= 0)
> + kfree(thread->srcs[i]);
> kfree(thread->srcs);
> err_srcs:
> kfree(pq_coefs);
--
Andy Shevchenko <andriy.shevchenko@xxxxxxxxx>
Intel Finland Oy
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
