lkml.org 
[lkml]   [2018]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] crypto/testmgr.c: fix sizeof() on COMP_BUF_SIZE
On 7 October 2018 at 13:58, Michael Schupikov <michael@schupikov.de> wrote:
> After allocation, output and decomp_output both point to memory chunks of
> size COMP_BUF_SIZE. Then, only the first bytes are zeroed out using
> sizeof(COMP_BUF_SIZE) as parameter to memset(), because
> sizeof(COMP_BUF_SIZE) provides the size of the constant and not the size of
> allocated memory.
>
> Instead, the whole allocated memory is meant to be zeroed out. Use
> COMP_BUF_SIZE as parameter to memset() directly in order to accomplish
> this.
>
> Fixes: 336073840a872 ("crypto: testmgr - Allow different compression results")
>
> Signed-off-by: Michael Schupikov <michael@schupikov.de>

Nice catch

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
> crypto/testmgr.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
> index a1d42245082a..790aa3536631 100644
> --- a/crypto/testmgr.c
> +++ b/crypto/testmgr.c
> @@ -1400,8 +1400,8 @@ static int test_comp(struct crypto_comp *tfm,
> int ilen;
> unsigned int dlen = COMP_BUF_SIZE;
>
> - memset(output, 0, sizeof(COMP_BUF_SIZE));
> - memset(decomp_output, 0, sizeof(COMP_BUF_SIZE));
> + memset(output, 0, COMP_BUF_SIZE);
> + memset(decomp_output, 0, COMP_BUF_SIZE);
>
> ilen = ctemplate[i].inlen;
> ret = crypto_comp_compress(tfm, ctemplate[i].input,
> @@ -1445,7 +1445,7 @@ static int test_comp(struct crypto_comp *tfm,
> int ilen;
> unsigned int dlen = COMP_BUF_SIZE;
>
> - memset(decomp_output, 0, sizeof(COMP_BUF_SIZE));
> + memset(decomp_output, 0, COMP_BUF_SIZE);
>
> ilen = dtemplate[i].inlen;
> ret = crypto_comp_decompress(tfm, dtemplate[i].input,
> --
> 2.19.0
>

\
 
 \ /
  Last update: 2018-10-08 13:40    [W:0.070 / U:3.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site