From patchwork Fri Mar 6 16:42:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 5956501 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 06D59BF440 for ; Fri, 6 Mar 2015 16:42:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3DF12038F for ; Fri, 6 Mar 2015 16:42:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D747420256 for ; Fri, 6 Mar 2015 16:42:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452AbbCFQms (ORCPT ); Fri, 6 Mar 2015 11:42:48 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:54077 "EHLO mailhub1.si.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645AbbCFQmr (ORCPT ); Fri, 6 Mar 2015 11:42:47 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id BC7521C8571; Fri, 6 Mar 2015 17:42:46 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub1.si.c-s.fr ([192.168.12.234]) by localhost (mailhub1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xhXV_92RebCI; Fri, 6 Mar 2015 17:42:46 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 8FB9A1C8570; Fri, 6 Mar 2015 17:42:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7CE70C73C5; Fri, 6 Mar 2015 17:42:46 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id AClFUyJNuByk; Fri, 6 Mar 2015 17:42:46 +0100 (CET) Received: from PO10863.localdomain (unknown [172.25.231.75]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 53269C73C4; Fri, 6 Mar 2015 17:42:46 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 401F51A241C; Fri, 6 Mar 2015 17:42:46 +0100 (CET) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" CC: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org 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) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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) \ { \