From: Gilad Ben-Yossef <gilad@benyossef.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ofir Drang <ofir.drang@arm.com>, stable <stable@vger.kernel.org>,
linux-crypto@vger.kernel.org,
driverdev-devel@linuxdriverproject.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/8] staging: ccree: fix leak of import() after init()
Date: Tue, 7 Nov 2017 09:39:57 +0000 [thread overview]
Message-ID: <1510047606-5589-2-git-send-email-gilad@benyossef.com> (raw)
In-Reply-To: <1510047606-5589-1-git-send-email-gilad@benyossef.com>
crypto_ahash_import() may be called either after
crypto_ahash_init() or without such call. Right now
we always internally call init() as part of
import(), thus leaking memory and mappings if the
user has already called init() herself.
Fix this by only calling init() internally if the
state is not already initialized.
Fixes: commit 454527d0d94f ("staging: ccree: fix hash import/export")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
---
drivers/staging/ccree/ssi_hash.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c
index d79090e..1799d3f 100644
--- a/drivers/staging/ccree/ssi_hash.c
+++ b/drivers/staging/ccree/ssi_hash.c
@@ -1778,9 +1778,12 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in)
}
in += sizeof(u32);
- rc = ssi_hash_init(state, ctx);
- if (rc)
- goto out;
+ /* call init() to allocate bufs if the user hasn't */
+ if (!state->digest_buff) {
+ rc = ssi_hash_init(state, ctx);
+ if (rc)
+ goto out;
+ }
dma_sync_single_for_cpu(dev, state->digest_buff_dma_addr,
ctx->inter_digestsize, DMA_BIDIRECTIONAL);
--
2.7.4
next prev parent reply other threads:[~2017-11-07 9:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 9:39 [PATCH 0/8] staging: ccree: fixes and cleanups Gilad Ben-Yossef
2017-11-07 9:39 ` Gilad Ben-Yossef [this message]
2017-11-07 9:39 ` [PATCH 2/8] staging: ccree: use more readable func names Gilad Ben-Yossef
2017-11-07 10:30 ` Dan Carpenter
2017-11-09 6:26 ` Gilad Ben-Yossef
2017-11-07 9:39 ` [PATCH 3/8] staging: ccree: simplify AEAD using local var Gilad Ben-Yossef
2017-11-07 10:35 ` Dan Carpenter
2017-11-07 9:40 ` [PATCH 4/8] staging: ccree: simplify buf mgr using local vars Gilad Ben-Yossef
2017-11-07 9:40 ` [PATCH 5/8] staging: ccree: fold common code into function Gilad Ben-Yossef
2017-11-07 10:40 ` Dan Carpenter
2017-11-07 9:40 ` [PATCH 6/8] staging: ccree: simplify pm manager using local var Gilad Ben-Yossef
2017-11-07 10:43 ` Dan Carpenter
2017-11-09 6:27 ` Gilad Ben-Yossef
2017-11-09 12:54 ` Dan Carpenter
2017-11-07 9:40 ` [PATCH 7/8] staging: ccree: remove compare to none zero Gilad Ben-Yossef
2017-11-07 10:52 ` Dan Carpenter
2017-11-07 9:40 ` [PATCH 8/8] staging: ccree: remove braces for single statement Gilad Ben-Yossef
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1510047606-5589-2-git-send-email-gilad@benyossef.com \
--to=gilad@benyossef.com \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ofir.drang@arm.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox