Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 6 insertions, 6 deletions

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index ffa9f4ccd9b4..337cf382718e 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -619,14 +619,14 @@ void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst,
         struct af_alg_ctx *ctx = ask->private;
         struct af_alg_tsgl *sgl;
         struct scatterlist *sg;
-        unsigned int i, j;
+        unsigned int i, j = 0;
 
         while (!list_empty(&ctx->tsgl_list)) {
                 sgl = list_first_entry(&ctx->tsgl_list, struct af_alg_tsgl,
                                        list);
                 sg = sgl->sg;
 
-                for (i = 0, j = 0; i < sgl->cur; i++) {
+                for (i = 0; i < sgl->cur; i++) {
                         size_t plen = min_t(size_t, used, sg[i].length);
                         struct page *page = sg_page(sg + i);
 
diff --git a/crypto/drbg.c b/crypto/drbg.c
index 633a88e93ab0..70018397e59a 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1133,10 +1133,10 @@ static inline void drbg_dealloc_state(struct drbg_state *drbg)
 {
         if (!drbg)
                 return;
-        kzfree(drbg->V);
-        drbg->Vbuf = NULL;
-        kzfree(drbg->C);
-        drbg->Cbuf = NULL;
+        kzfree(drbg->Vbuf);
+        drbg->V = NULL;
+        kzfree(drbg->Cbuf);
+        drbg->C = NULL;
         kzfree(drbg->scratchpadbuf);
         drbg->scratchpadbuf = NULL;
         drbg->reseed_ctr = 0;