trusted-keys: avoid scattring va_end()

We can avoid scattering va_end() within the

  va_start();
  for (;;) {

  }
  va_end();

loop, assuming that crypto_shash_init()/crypto_shash_update() return 0 on
success and negative value otherwise.

Make TSS_authhmac()/TSS_checkhmac1()/TSS_checkhmac2() similar to TSS_rawhmac()
by removing "va_end()/goto" from the loop.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>

diff --git a/security/keys/trusted_defined.c b/security/keys/trusted_defined.c
index f7d06776faf0f533576aa5fca4935dcd14d1fa6a..2836c6dc18a31247c839f50d46d1632c9a0e17d5 100644 (file)
--- a/security/keys/trusted_defined.c
+++ b/security/keys/trusted_defined.c
@@ -150,17 +150,15 @@ static int TSS_authhmac(unsigned char *digest, const unsigned char *key,
                data = va_arg(argp, unsigned char *);
                if (!data) {
                        ret = -EINVAL;
-                       va_end(argp);
-                       goto out;
+                       break;
                }
                ret = crypto_shash_update(&sdesc->shash, data, dlen);
-               if (ret < 0) {
-                       va_end(argp);
-                       goto out;
-               }
+               if (ret < 0)
+                       break;
        }
        va_end(argp);
-       ret = crypto_shash_final(&sdesc->shash, paramdigest);
+       if (!ret)
+               ret = crypto_shash_final(&sdesc->shash, paramdigest);
        if (!ret)
                ret = TSS_rawhmac(digest, key, keylen, SHA1_DIGEST_SIZE,
                                  paramdigest, TPM_NONCE_SIZE, h1,
@@ -229,13 +227,12 @@ static int TSS_checkhmac1(unsigned char *buffer,
                        break;
                dpos = va_arg(argp, unsigned int);
                ret = crypto_shash_update(&sdesc->shash, buffer + dpos, dlen);
-               if (ret < 0) {
-                       va_end(argp);
-                       goto out;
-               }
+               if (ret < 0)
+                       break;
        }
        va_end(argp);
-       ret = crypto_shash_final(&sdesc->shash, paramdigest);
+       if (!ret)
+               ret = crypto_shash_final(&sdesc->shash, paramdigest);
        if (ret < 0)
                goto out;
 
@@ -323,13 +320,12 @@ static int TSS_checkhmac2(unsigned char *buffer,
                        break;
                dpos = va_arg(argp, unsigned int);
                ret = crypto_shash_update(&sdesc->shash, buffer + dpos, dlen);
-               if (ret < 0) {
-                       va_end(argp);
-                       goto out;
-               }
+               if (ret < 0)
+                       break;
        }
        va_end(argp);
-       ret = crypto_shash_final(&sdesc->shash, paramdigest);
+       if (!ret)
+               ret = crypto_shash_final(&sdesc->shash, paramdigest);
        if (ret < 0)
                goto out;