Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / crypto / drbg.c

diff --git a/crypto/drbg.c b/crypto/drbg.c
index 56c1d7ec3d9e3280725cbf6358207318a3d5ca35..b69409cb7e6ac70b6d9ae4c19c469ad7abb684e6 100644 (file)
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1280,7 +1280,7 @@ static void drbg_restore_shadow(struct drbg_state *drbg,
  *       as defined in SP800-90A. The additional input is mixed into
  *       the state in addition to the pulled entropy.
  *
- * return: generated number of bytes
+ * return: 0 when all bytes are generated; < 0 in case of an error
  */
 static int drbg_generate(struct drbg_state *drbg,
                         unsigned char *buf, unsigned int buflen,
@@ -1419,6 +1419,11 @@ static int drbg_generate(struct drbg_state *drbg,
        }
 #endif
 
+       /*
+        * All operations were successful, return 0 as mandated by
+        * the kernel crypto API interface.
+        */
+       len = 0;
 err:
        shadow->d_ops->crypto_fini(shadow);
        drbg_restore_shadow(drbg, &shadow);