From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailhub1.si.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.ozlabs.org (Postfix) with ESMTP id 526761A0E15 for ; Sat, 7 Mar 2015 03:42:48 +1100 (AEDT) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" Subject: [PATCH v2 16/17] crypto: talitos - SEC1 bugs on 0 data hash Message-Id: <20150306164246.401F51A241C@localhost.localdomain> Date: Fri, 6 Mar 2015 17:42:46 +0100 (CET) Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , SEC1 bugs on 0 data hash, so we submit an already padded block representing 0 data Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 3 +++ drivers/crypto/talitos1.c | 21 +++++++++++++++++++++ drivers/crypto/talitos1.h | 4 ++++ drivers/crypto/talitos2.h | 6 ++++++ 4 files changed, 34 insertions(+) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 82a5181..0cb8ab4 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -815,6 +815,9 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc, to_talitos_next_desc_clear(desc); + if (desc->ptr[3].len == 0) + talitos_handle_buggy_hash(ctx, edesc, &desc->ptr[3]); + ret = talitos_submit(dev, ctx->ch, desc, callback, areq); if (ret != -EINPROGRESS) { common_nonsnoop_hash_unmap(dev, edesc, areq); diff --git a/drivers/crypto/talitos1.c b/drivers/crypto/talitos1.c index c1a8e9e..1edaa68 100644 --- a/drivers/crypto/talitos1.c +++ b/drivers/crypto/talitos1.c @@ -174,3 +174,24 @@ void talitos_error(struct device *dev, u32 isr, u32 isr_lo) talitos_init_device(dev); } } + +/* + * SEC1 doesn't like hashing of 0 sized message, so we do the padding + * ourself and submit a padded block + */ +void talitos_handle_buggy_hash(struct talitos_ctx *ctx, + struct talitos_edesc *edesc, + struct talitos_ptr *ptr) +{ + static u8 padded_hash[64] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }; + + pr_err_once("Bug in SEC1, padding ourself\n"); + edesc->desc.hdr &= ~DESC_HDR_MODE0_MDEU_PAD; + map_single_talitos_ptr(ctx->dev, ptr, sizeof(padded_hash), + (char *)padded_hash, 0, DMA_TO_DEVICE); +} diff --git a/drivers/crypto/talitos1.h b/drivers/crypto/talitos1.h index f78d89d..a9e0619 100644 --- a/drivers/crypto/talitos1.h +++ b/drivers/crypto/talitos1.h @@ -277,6 +277,10 @@ static inline void ahash_process_chain(struct scatterlist *src, int nbytes, } } +extern void talitos_handle_buggy_hash(struct talitos_ctx *ctx, + struct talitos_edesc *edesc, + struct talitos_ptr *ptr); + #define DEF_TALITOS_DONE(name, ch_done_mask) \ static void talitos_done_##name(unsigned long data) \ { \ diff --git a/drivers/crypto/talitos2.h b/drivers/crypto/talitos2.h index 2715c72..de0c8f4 100644 --- a/drivers/crypto/talitos2.h +++ b/drivers/crypto/talitos2.h @@ -266,6 +266,12 @@ static inline void ahash_process_chain(struct scatterlist *src, int nbytes, req_ctx->psrc = src; } +static inline void talitos_handle_buggy_hash(struct talitos_ctx *ctx, + struct talitos_edesc *edesc, + struct talitos_ptr *ptr) +{ +} + #define DEF_TALITOS_DONE(name, ch_done_mask) \ static void talitos_done_##name(unsigned long data) \ { \ -- 2.1.0