lkml.org 
[lkml]   [2011]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/3] trusted-keys: another free memory bugfix
    On Mon, 17 Jan 2011, Tetsuo Handa wrote:

    > Resending in separated mails in case somebody missed that
    > there was 3 patches in one mail.
    > ----------------------------------------
    > >From 94e965700f1e401408836d4aa782105483196842 Mon Sep 17 00:00:00 2001
    > From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    > Date: Mon, 17 Jan 2011 09:22:47 +0900
    > Subject: [PATCH 1/3] trusted-keys: another free memory bugfix
    >
    > TSS_rawhmac() forgot to call va_end()/kfree() when data == NULL and
    > forgot to call va_end() when crypto_shash_update() < 0.
    > Fix these bugs by escaping from the loop using "break"
    > (rather than "return"/"goto") in order to make sure that
    > va_end()/kfree() are always called.
    >
    > Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    > ---
    > security/keys/trusted_defined.c | 8 +++++---
    > 1 files changed, 5 insertions(+), 3 deletions(-)
    >
    > diff --git a/security/keys/trusted_defined.c b/security/keys/trusted_defined.c
    > index 932f868..7b21795 100644
    > --- a/security/keys/trusted_defined.c
    > +++ b/security/keys/trusted_defined.c
    > @@ -101,11 +101,13 @@ static int TSS_rawhmac(unsigned char *digest, const unsigned char *key,
    > if (dlen == 0)
    > break;
    > data = va_arg(argp, unsigned char *);
    > - if (data == NULL)
    > - return -EINVAL;
    > + if (data == NULL) {
    > + ret = -EINVAL;
    > + break;
    > + }
    > ret = crypto_shash_update(&sdesc->shash, data, dlen);
    > if (ret < 0)
    > - goto out;
    > + break;
    > }
    > va_end(argp);
    > if (!ret)
    >

    Looks good to me.

    Reviewed-by: Jesper Juhl <jj@chaosbits.net>

    --
    Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
    Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
    Plain text mails only, please.



    \
     
     \ /
      Last update: 2011-01-17 19:37    [W:0.022 / U:61.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site