From: Corentin Labbe <clabbe@baylibre.com> To: arnd@arndb.de, davem@davemloft.net, herbert@gondor.apana.org.au, mripard@kernel.org, wens@csie.org Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe <clabbe@baylibre.com> Subject: [PATCH 1/7] crypto: sun4i-ss: linearize buffers content must be kept Date: Thu, 17 Sep 2020 18:35:52 +0000 [thread overview] Message-ID: <1600367758-28589-2-git-send-email-clabbe@baylibre.com> (raw) In-Reply-To: <1600367758-28589-1-git-send-email-clabbe@baylibre.com> When running the non-optimized cipher function, SS produce partial random output. This is due to linearize buffers being reseted after each loop. Fixes: 8d3bcb9900ca ("crypto: sun4i-ss - reduce stack usage") Signed-off-by: Corentin Labbe <clabbe@baylibre.com> --- drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c index b72de8939497..b92d175b5d2a 100644 --- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c +++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c @@ -163,6 +163,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) unsigned int todo; struct sg_mapping_iter mi, mo; unsigned int oi, oo; /* offset for in and out */ + char buf[4 * SS_RX_MAX];/* buffer for linearize SG src */ + char bufo[4 * SS_TX_MAX]; /* buffer for linearize SG dst */ unsigned int ob = 0; /* offset in buf */ unsigned int obo = 0; /* offset in bufo*/ unsigned int obl = 0; /* length of data in bufo */ @@ -233,8 +235,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) while (oleft) { if (ileft) { - char buf[4 * SS_RX_MAX];/* buffer for linearize SG src */ - /* * todo is the number of consecutive 4byte word that we * can read from current SG @@ -295,8 +295,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) oo = 0; } } else { - char bufo[4 * SS_TX_MAX]; /* buffer for linearize SG dst */ - /* * read obl bytes in bufo, we read at maximum for * emptying the device -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Corentin Labbe <clabbe@baylibre.com> To: arnd@arndb.de, davem@davemloft.net, herbert@gondor.apana.org.au, mripard@kernel.org, wens@csie.org Cc: Corentin Labbe <clabbe@baylibre.com>, linux-sunxi@googlegroups.com, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] crypto: sun4i-ss: linearize buffers content must be kept Date: Thu, 17 Sep 2020 18:35:52 +0000 [thread overview] Message-ID: <1600367758-28589-2-git-send-email-clabbe@baylibre.com> (raw) In-Reply-To: <1600367758-28589-1-git-send-email-clabbe@baylibre.com> When running the non-optimized cipher function, SS produce partial random output. This is due to linearize buffers being reseted after each loop. Fixes: 8d3bcb9900ca ("crypto: sun4i-ss - reduce stack usage") Signed-off-by: Corentin Labbe <clabbe@baylibre.com> --- drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c index b72de8939497..b92d175b5d2a 100644 --- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c +++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c @@ -163,6 +163,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) unsigned int todo; struct sg_mapping_iter mi, mo; unsigned int oi, oo; /* offset for in and out */ + char buf[4 * SS_RX_MAX];/* buffer for linearize SG src */ + char bufo[4 * SS_TX_MAX]; /* buffer for linearize SG dst */ unsigned int ob = 0; /* offset in buf */ unsigned int obo = 0; /* offset in bufo*/ unsigned int obl = 0; /* length of data in bufo */ @@ -233,8 +235,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) while (oleft) { if (ileft) { - char buf[4 * SS_RX_MAX];/* buffer for linearize SG src */ - /* * todo is the number of consecutive 4byte word that we * can read from current SG @@ -295,8 +295,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) oo = 0; } } else { - char bufo[4 * SS_TX_MAX]; /* buffer for linearize SG dst */ - /* * read obl bytes in bufo, we read at maximum for * emptying the device -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-17 18:36 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-17 18:35 [PATCH 0/7] crypto: sun4i-ss: prevent always fallback for ciphers Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe [this message] 2020-09-17 18:35 ` [PATCH 1/7] crypto: sun4i-ss: linearize buffers content must be kept Corentin Labbe 2020-09-17 18:35 ` [PATCH 2/7] crypto: sun4i-ss: checking sg length is not sufficient Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe 2020-09-21 12:54 ` Sasha Levin 2020-09-21 12:54 ` Sasha Levin 2020-09-17 18:35 ` [PATCH 3/7] crypto: sun4i-ss: IV register does not work on A10 and A13 Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe 2020-09-17 18:35 ` [PATCH 4/7] crypto: sun4i-ss: handle BigEndian for cipher Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe 2020-09-18 7:31 ` Herbert Xu 2020-09-18 7:31 ` Herbert Xu 2020-09-18 8:06 ` LABBE Corentin 2020-09-18 8:06 ` LABBE Corentin 2020-09-18 8:09 ` Herbert Xu 2020-09-18 8:09 ` Herbert Xu 2020-09-19 19:05 ` LABBE Corentin 2020-09-19 19:05 ` LABBE Corentin 2020-09-17 18:35 ` [PATCH 5/7] crypto: sun4i-ss: initialize need_fallback Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe 2020-09-17 18:35 ` [PATCH 6/7] crypto: sun4i-ss: enabled stats via debugfs Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe 2020-09-17 18:35 ` [PATCH 7/7] crypto: sun4i-ss: add SPDX header and remove blank lines Corentin Labbe 2020-09-17 18:35 ` Corentin Labbe
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=1600367758-28589-2-git-send-email-clabbe@baylibre.com \ --to=clabbe@baylibre.com \ --cc=arnd@arndb.de \ --cc=davem@davemloft.net \ --cc=herbert@gondor.apana.org.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=mripard@kernel.org \ --cc=wens@csie.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.