From patchwork Thu Apr 18 08:17:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10906623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 418EC1515 for ; Thu, 18 Apr 2019 08:18:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2545728C35 for ; Thu, 18 Apr 2019 08:18:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 230B728C3D; Thu, 18 Apr 2019 08:18:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D011028C35 for ; Thu, 18 Apr 2019 08:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yMjpQi5+sA1zFuFHyxFz43/xOGvdJ0UE1+pxNWskBaw=; b=mxlpCmBcA0Vvzt U4GMl1jaOKugplth7c/Wlfp63qj+s4WirFgUSzGodz38EEvy2ACRHm1Bofg9BnqsDkvW2Og70QuGX 7B4q9R5rbvRcnMJ0QXOE3Ji1ikWN5WIefZwolulWb/PjXsiVavlo7nuGWWfa/GEYyyYeoXyL1ct/r f6T9Kj4nRZkGh1P4e6dQPODYGL7eHrlt5YwU0xOqdL2OLRLzpYENGJGLuqY4U1mOI3m5BGODE/gJt hhi/n2Dz2TddEN4R5WGv81x5JqoVvum1zrfD+AQfs1N53yx8W+YmvxcHK+BD3sG19LXB7Pl/KiYfy ycayZ23kM4HUjdVDvCkg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2F7-0004G9-J5; Thu, 18 Apr 2019 08:18:01 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2Ex-00046O-E0 for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 08:17:52 +0000 Received: by mail-wr1-x442.google.com with SMTP id w10so1834847wrm.4 for ; Thu, 18 Apr 2019 01:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lbhj8bDRlGdjkw0r97iacsqSjh2r3SUzy01sQ+arMeo=; b=i/W+vQnMNWVRXvSrVDeiwlrhl2QeYwQKlLnhehk28cSRDI5UC48p5HU4zSVczDl/dt hhBlKFMsr6c2h37TdvN3cOvYv+hI9zcIBQugK5oWfr/1R+AxnghN0pXNgSh15aGngAvk uuhKu9VWyA79Yv9fX8x2qITn8jlt0j+MhL/J5Ac81WENb2JphmXnEQq2QXGbajuiTtGS SdB9WGNi59R1qVnjrkbj53M2bCvxczYwC2I9VoNAu1IXagQzIP/KpeyJHCLp57m3Hykk ajim3OiK30xZ+P08Xnd4iDQ2q0BjCxqHAT3sMLpmNDIanPRpIaZbdyObPdoKJ0CetVOH Un4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lbhj8bDRlGdjkw0r97iacsqSjh2r3SUzy01sQ+arMeo=; b=LDT2FDeFFqHTz++wYYHtvhak7DSzigj5lu/0kPYG6OeOZT/LEdSY/gF7XbhzLF2cL5 D6ijufOmssXW1hqGDqn8EV8e5PcupOKSsI621SEfGWU2TEDh8pWovNOpkJxs67Zqs9nV GR/fKzRr5u9qG0b7izvRq8h+pZEzw/ANiEMeYgl+OGUdPcVr4nXUfVUC3+4DJ0F+wzGc +B2nQ69DCd1ep+bhlXDQchTnP2SdozpJesixgLxfMKQgXICUeYbjQdthTEGKbHbzQ18E TvXey3XNrUOZHk/qVmgUoEz5CS4LurwDSkvIglv+qAO+8gklDwUVNjubzUXo1DqHEbyt Q8zg== X-Gm-Message-State: APjAAAX3Q8iyDnon5eSOogNNRZrXC3EPF96009E8q2gufJPECwYXA6W1 +ZkM1hww9OFYkG8UWOHAyTA= X-Google-Smtp-Source: APXvYqzAW90VmJAKDpYvoaxELb5UbsycuFAN3B6Bj3RDyGebZWwlAj7x8SGMwYPSG0l8/HNd+7BVBQ== X-Received: by 2002:adf:b68d:: with SMTP id j13mr63110093wre.50.1555575469910; Thu, 18 Apr 2019 01:17:49 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w11sm2350619wre.15.2019.04.18.01.17.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 01:17:49 -0700 (PDT) From: Corentin Labbe To: davem@davemloft.net, herbert@gondor.apana.org.au, maxime.ripard@bootlin.com, wens@csie.org Subject: [PATCH 1/4] crypto: sun4i-ss: Handle better absence/presence of IV Date: Thu, 18 Apr 2019 10:17:32 +0200 Message-Id: <20190418081735.19002-2-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418081735.19002-1-clabbe.montjoie@gmail.com> References: <20190418081735.19002-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190418_011751_467222_81C9BD4F X-CRM114-Status: GOOD ( 11.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, ebiggers@kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch remove the test against areq->info since sun4i-ss could work without it (ECB). Fixes: 6298e948215f ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator") Signed-off-by: Corentin Labbe --- drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c index 06df336488fb..4b60f8fdd1c8 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c @@ -41,11 +41,6 @@ static int sun4i_ss_opti_poll(struct skcipher_request *areq) if (!areq->cryptlen) return 0; - if (!areq->iv) { - dev_err_ratelimited(ss->dev, "ERROR: Empty IV\n"); - return -EINVAL; - } - if (!areq->src || !areq->dst) { dev_err_ratelimited(ss->dev, "ERROR: Some SGs are NULL\n"); return -EINVAL; @@ -157,11 +152,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) if (!areq->cryptlen) return 0; - if (!areq->iv) { - dev_err_ratelimited(ss->dev, "ERROR: Empty IV\n"); - return -EINVAL; - } - if (!areq->src || !areq->dst) { dev_err_ratelimited(ss->dev, "ERROR: Some SGs are NULL\n"); return -EINVAL; From patchwork Thu Apr 18 08:17:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10906625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8AFF1515 for ; Thu, 18 Apr 2019 08:18:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DA7328C37 for ; Thu, 18 Apr 2019 08:18:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 914F628C3E; Thu, 18 Apr 2019 08:18:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 381E328C37 for ; Thu, 18 Apr 2019 08:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OpJoZ/PywkKqc5VKA926ZKlUSOOlF2EUr01boxrLZ1I=; b=gDaZGPN/3iuvjR I9toYbPlg9ThXTzDzQSwJDTJtDssIUJYQsKRCdru97UZ4SzEkR9RERju9Wi5tP/BZMa2vEg55pjL+ xxyEzyVh11jqCYOLXm5K2hCOLHIUVA9YuOvMwQyP5BPYKw1d5zGTQQKB9Sny1d98jjlLOIrEvrz4Q sYDdoEAF2E5cLjjElIpvPciL1Fd1wJXtWu4dqGx6veXcCiQzKSe1M13RAwP5hLBUlsgC6upcustJs S7bbsOCyhfuF+6weWdsKxMZH4kC6URSzkt28ZF6TP0sRwkey+zBqZ+s2HuVi4vNiX47kxfLQgqNrs TDjm+fVB4FjQt1zKxIQQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2FG-0004V7-Fn; Thu, 18 Apr 2019 08:18:10 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2Ey-00046d-8V for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 08:17:53 +0000 Received: by mail-wr1-x442.google.com with SMTP id r4so1802593wrq.8 for ; Thu, 18 Apr 2019 01:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Oa4Mo8b8dqWphkeFQAL0N8F8rFHV+7qiodUTdHFrPA=; b=A9S7ERqPxCdpYEOO92/iiqJT0FDISgCqfUojAtdwbZVNI3kDYFplGyNoamMhpzotXd +KB6YmhtdMoB9V+HrBw8kozqvClVqD2zD1nvx1zoNJ3p/7nWdA/M86IACynN2APSX3d1 84t3EYpYiwqCBUxxvku+zmuBnhoz/8Hfpi0c2LDRQ6pddGY58ot5mT4ud/yLtHh+acdz ozW+P11h5X9NFwtUrw1GGrd7fGH1uzoAhk5ELgqgIMJ3MOf33/3FHpdM5XyPuVrPV46i 9JNXdvvTWpJTHLOgCJfW8RLwhzqluP+Ofy3uI/PyU9L/w8jRDTWc741lFzqYxqyUmvik ABdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2Oa4Mo8b8dqWphkeFQAL0N8F8rFHV+7qiodUTdHFrPA=; b=gzT358Q8ohwjQo4suaKkT+CNYJ/+TOJD+9UsG4FU9BOY3ZQTPClyWKfCSqrUOHDrum 3+zsKFV9YvK5DEE1y7u7BV6IZw3Ab/r0egGsVSj+TlWgr6vRMhV30MxwpvEo11uYhmMA fC7C8WJo47fdgSpvNrZBOVM+IhDdegG3N0vwt/bOTYx7uv1BzaDA+c2Avb6y6KmjrbGD gOOQ8H4uiLZ+2nsNWK2TO/otXBh10u88Ybokn2c9NkT4XQsdlE4S4XaT3T890f6C12GX 4KpKBWoHI6Ddshm0gjfgeqa8seTm6q6GBrFr7yN0TUW7N6wc0Kl6oTwV/PayCqJPgas8 iyhA== X-Gm-Message-State: APjAAAV7+htP6HlijqT/F/LTDi2vHSdun55p9CuJVLqw0rFiAZnUoeSX 9ys4hkr8S95vKrT0EESDGkEORlqS X-Google-Smtp-Source: APXvYqxqwn40/5+L9A3+eP89pCq6/pHgjFgjoZcWIcs6d3AsCTW0oN9srLawfCgS3eEVWRAahhCjFA== X-Received: by 2002:adf:f90c:: with SMTP id b12mr36495886wrr.63.1555575471082; Thu, 18 Apr 2019 01:17:51 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w11sm2350619wre.15.2019.04.18.01.17.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 01:17:50 -0700 (PDT) From: Corentin Labbe To: davem@davemloft.net, herbert@gondor.apana.org.au, maxime.ripard@bootlin.com, wens@csie.org Subject: [PATCH 2/4] crypto: sun4i-ss: remove ivsize from ECB Date: Thu, 18 Apr 2019 10:17:33 +0200 Message-Id: <20190418081735.19002-3-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418081735.19002-1-clabbe.montjoie@gmail.com> References: <20190418081735.19002-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190418_011752_298202_991FE7E8 X-CRM114-Status: GOOD ( 10.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, ebiggers@kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP ECB algos does not need IV. Fixes: 6298e948215f ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator") Signed-off-by: Corentin Labbe --- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c index 6b2e186dfa8b..3d9c5ad6cbb8 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c @@ -107,7 +107,6 @@ static struct sun4i_ss_alg_template ss_algs[] = { .decrypt = sun4i_ss_ecb_aes_decrypt, .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, - .ivsize = AES_BLOCK_SIZE, .base = { .cra_name = "ecb(aes)", .cra_driver_name = "ecb-aes-sun4i-ss", @@ -190,7 +189,6 @@ static struct sun4i_ss_alg_template ss_algs[] = { .decrypt = sun4i_ss_ecb_des3_decrypt, .min_keysize = DES3_EDE_KEY_SIZE, .max_keysize = DES3_EDE_KEY_SIZE, - .ivsize = DES3_EDE_BLOCK_SIZE, .base = { .cra_name = "ecb(des3_ede)", .cra_driver_name = "ecb-des3-sun4i-ss", From patchwork Thu Apr 18 08:17:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10906631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC44F1515 for ; Thu, 18 Apr 2019 08:18:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B22D328C1E for ; Thu, 18 Apr 2019 08:18:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A65F328C34; Thu, 18 Apr 2019 08:18:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5AF3428C1E for ; Thu, 18 Apr 2019 08:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Z0gRea4AdeJrlj8f2EILkD19ijB+3172SXV4JtJKYE8=; b=Udwch+RIL+MWl1 Cc4oWhnPTIjqXnUygEtUbgk7DiZgSgn+Lw82rIPIWHUW3sOt09WAOII4cusRzgHUneukiO2cs6u+d +KyMp9rteHa8Hti+dR9CjmScbrfruRh4VKr91mf1iWWHsUEv/Spcit3AKlCMkVbRAbg8QGNjKhjXm J4amdf8zKy1znGgpy5YWmhvuIFKO5eTLdrkCAB28WwfKmSBtxggPoSs0fzoBRxhRG86IVBkpCcDNG ngDudd3LomAgPodTWeE6Q3D+ULeyl+U/la3hk95YdHmp/Q/YgCAWF9n/U5sUEaN0eG+9CqJ+fZK1D IQW/AcdVeAP1y25Q14vw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2Fj-00050s-O7; Thu, 18 Apr 2019 08:18:39 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2Ez-00047L-TQ for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 08:17:56 +0000 Received: by mail-wm1-x342.google.com with SMTP id a184so1714089wma.2 for ; Thu, 18 Apr 2019 01:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z5FqXHUkkOxiPqY9isBq9yK5Qx1B2t+uIrpEWzqHhn4=; b=ScQFT3IFvQa3euQsJP1/Jz+BGtaJxiOW7DbwNa0GEW0uzJdXZjsVsr1ixuuH+SDaof C3Nlzbc13LL7Z6bDjxnnceYseWsGmSGaKuVBmfTnCTsp5tm1TrPtTSruQIRKFPJFFpCL yCJEGWXHfNbvUEOzMnnTYF7box5TzYUHuZL2itCwVP7NWbVUUBab1aNxQK9uwLBJpKxF pyNbKowIkgsmzRaYpMP3J8XRL3+QvYX74O+trtA//jC81NVb6i2TqC7Jtqe9xtDij4lt YpfxXiwQ1ieUgyC30tX5zTCFsbTkfxqjrVcnRCvkyZdfjXKbV5u5Fj1T+e/pF7l5jgYV zkfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z5FqXHUkkOxiPqY9isBq9yK5Qx1B2t+uIrpEWzqHhn4=; b=C+ADOrlFb6JCMlpe+CSg0P1fhmKikHGzc0ZuRpLgmY/Z/xLjyeTCrvsKbfaqiNbp00 fwbbZgyWG1PcsuNTWhZRB0DUEboPU2Hg/qV4n6CG5vQt0oo0zCmSJp8g72F8uYDVw1CH VUUMiwMXgEwjLyB3NvMf9Sszi9UkggjxDruummoMNSRAdbJ16HgvfjnbH5LWLXs8FVu3 gF71RRCiU1nCKenRt+y7isBtCS5UqbAxswL0rP2KgkHhf9DBvPZcBP8FcYT9wro//FE/ wFTg5/6ZykFI3DsCy35GjivtlQx7lrSk87SjzjXz1+wivhbMhCNei82fdSLTfYMtVhfq AKPA== X-Gm-Message-State: APjAAAVJAxnYyhzj1+9laO4MRe7ir/dXj8+5UlNS97agKyer0sIQc0R5 5+He7Trz+LIkNmjY8pJf4Ss= X-Google-Smtp-Source: APXvYqxOJJGqvqm8GMhlQeF9XODmg5oHOxr6NI3SDMdQJl+Z8fVYcMK2cP6yM7YiAKz9TiRU4RLGxw== X-Received: by 2002:a1c:4602:: with SMTP id t2mr1991850wma.120.1555575472351; Thu, 18 Apr 2019 01:17:52 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w11sm2350619wre.15.2019.04.18.01.17.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 01:17:51 -0700 (PDT) From: Corentin Labbe To: davem@davemloft.net, herbert@gondor.apana.org.au, maxime.ripard@bootlin.com, wens@csie.org Subject: [PATCH 3/4] crypto: sun4i-ss: Fix invalid calculation of hash end Date: Thu, 18 Apr 2019 10:17:34 +0200 Message-Id: <20190418081735.19002-4-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418081735.19002-1-clabbe.montjoie@gmail.com> References: <20190418081735.19002-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190418_011754_012883_8C562E9E X-CRM114-Status: GOOD ( 13.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, ebiggers@kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP When nbytes < 4, end is wronlgy set to a negative value which, due to uint, is then interpreted to a large value leading to a deadlock in the following code. This patch fix this problem. Fixes: 6298e948215f ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator") Signed-off-by: Corentin Labbe --- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c index a4b5ff2b72f8..f6936bb3b7be 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c @@ -240,7 +240,10 @@ static int sun4i_hash(struct ahash_request *areq) } } else { /* Since we have the flag final, we can go up to modulo 4 */ - end = ((areq->nbytes + op->len) / 4) * 4 - op->len; + if (areq->nbytes < 4) + end = 0; + else + end = ((areq->nbytes + op->len) / 4) * 4 - op->len; } /* TODO if SGlen % 4 and !op->len then DMA */ From patchwork Thu Apr 18 08:17:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 10906633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2652B1515 for ; Thu, 18 Apr 2019 08:18:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0698328C38 for ; Thu, 18 Apr 2019 08:18:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE79328C33; Thu, 18 Apr 2019 08:18:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 51FBB28C35 for ; Thu, 18 Apr 2019 08:18:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3BqauROSkm6hoD5a2R6CSBNS+Ldd2dyLaps7qe7mGQA=; b=Z/M3l3+ltzu2G8 fqXE9lcDUv4O2NhP4+HpjxRunBCpCQ0SXW3bUSf+8zIIaAKZz1Nm2Zh0bJCTp0493/9I3TP5YxHOL +R10IIUu1c4GnvfLGpj+wfKMO+ScNEID2ymcP1I+7ZTy3nHaHJRJ+tdXvmwwSUsw55QxpGWBbAoAy 7hbkSF+i9sUuJqnr9glucf+nTO+dqpBpgSYTCWqBW2DcBX55MvAEkjrM4YGBolPbgJJvD5Toc5VBs +7zdJDmnOtUAPuDAiL+P8bbJJkpVra+94HkOukM5k2Ksl61aNPZM3Spm0UUIQhcZVNusT/CrPW5X8 cZhDDb1vqU23CUvwz+tA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2Fq-00058M-QX; Thu, 18 Apr 2019 08:18:46 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH2F1-00048S-Bz for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 08:18:01 +0000 Received: by mail-wr1-x444.google.com with SMTP id h4so1807089wre.7 for ; Thu, 18 Apr 2019 01:17:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LXzCrJpqf5sa36CDPY/H5+U5MbOo12IcOmxvO92eWy0=; b=rrgDD4+WJIyT8JuL7jpXNbKYuTuo0bd3FeuyJq2GlXSQ5EUs/XWVmDQRUQQRBKqERu TV67YsvyK4ZJpzh3VarJa7L12cRYwkrun/wvkFel0yElpqXMJHZufVQLcoEzbm4CaJR1 yCEgc+CdnS2sff6bY2GEs9PAzprgiQZql0BiBQ6mt1FtGIoKX5CTEWwcLYnbom4MIm0m rLH7VlRMtxcjYHhe4JlH4Qts3EkBP178lfstvaiyzybJTUS7s8OSGBjwZ9aMxVZPpt4w mSkAQJ9GZSA2N5N38YYGt4GKCah3LBr2b465reI17/bR6/TknJ5jgvTRZxN1DW4RCXdU KTtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LXzCrJpqf5sa36CDPY/H5+U5MbOo12IcOmxvO92eWy0=; b=q93xc0CYaiKuRLHOskYbLe16AJQ/fDbBvQUkL+8mhT81DgKGrS4XLySRJn5XhLM4xF bY79B2m46HOcP18/h8nVuUVje+omIBmShWAtl/3IHahh1TI2cf8mKOiJrhatUQGI1KkZ 4r7ixH0vPQgkzR2uoTKupETVnCQdFurm+PWPHVT0LP5FKR9J/AQIz8Ocq9p0SAmdaFvg fK8i62EMePspUoTtS6Gj6EMHeM6JIXIrlgjC3kBtVt7fYfkqrqyVG1j9S20dK4o6G37r HMxHuLz+MfO1QVd/JTN6XzgqbgPBPDoCrbaZKOVVU8o9gLgNZUuqwV8y2eiW25qmTnHo mOSA== X-Gm-Message-State: APjAAAW4LzhYVaT8fEtRZwPsJuNcADwVjxq7jAsiFkSgVUBeo4i4qshx jgXRFb7tW/waMP6u9Q9/3s4= X-Google-Smtp-Source: APXvYqwOnGd4VaevTgxPHDrn61v0zQWOIqo/ZTOaWX/2T42/5ITjK92PwaUY00F3tTHS2xeASI8Wmw== X-Received: by 2002:a5d:52ce:: with SMTP id r14mr6515750wrv.224.1555575473987; Thu, 18 Apr 2019 01:17:53 -0700 (PDT) Received: from Red.localdomain ([2a01:cb1d:147:7200:2e56:dcff:fed2:c6d6]) by smtp.googlemail.com with ESMTPSA id w11sm2350619wre.15.2019.04.18.01.17.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 01:17:53 -0700 (PDT) From: Corentin Labbe To: davem@davemloft.net, herbert@gondor.apana.org.au, maxime.ripard@bootlin.com, wens@csie.org Subject: [PATCH 4/4] crypto: sun4i-ss: fallback when length is not multiple of blocksize Date: Thu, 18 Apr 2019 10:17:35 +0200 Message-Id: <20190418081735.19002-5-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418081735.19002-1-clabbe.montjoie@gmail.com> References: <20190418081735.19002-1-clabbe.montjoie@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190418_011755_823452_F04B397D X-CRM114-Status: GOOD ( 18.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, ebiggers@kernel.org, linux-sunxi@googlegroups.com, Corentin Labbe , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP sun4i-ss does not handle requests when length are not a multiple of blocksize. This patch adds a fallback for that case. Fixes: 6298e948215f ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator") Signed-off-by: Corentin Labbe --- drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 57 +++++++++++++++++++++-- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 17 +++++-- drivers/crypto/sunxi-ss/sun4i-ss.h | 2 + 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c index 4b60f8fdd1c8..b060a0810934 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-cipher.c @@ -129,6 +129,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) struct scatterlist *out_sg = areq->dst; unsigned int ivsize = crypto_skcipher_ivsize(tfm); struct sun4i_cipher_req_ctx *ctx = skcipher_request_ctx(areq); + struct skcipher_alg *alg = crypto_skcipher_alg(tfm); + struct sun4i_ss_alg_template *algt; u32 mode = ctx->mode; /* when activating SS, the default FIFO space is SS_RX_DEFAULT(32) */ u32 rx_cnt = SS_RX_DEFAULT; @@ -148,6 +150,7 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) unsigned int obo = 0; /* offset in bufo*/ unsigned int obl = 0; /* length of data in bufo */ unsigned long flags; + bool need_fallback; if (!areq->cryptlen) return 0; @@ -157,6 +160,10 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) return -EINVAL; } + algt = container_of(alg, struct sun4i_ss_alg_template, alg.crypto); + if (areq->cryptlen % algt->alg.crypto.base.cra_blocksize) + need_fallback = true; + /* * if we have only SGs with size multiple of 4, * we can use the SS optimized function @@ -172,9 +179,24 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) out_sg = sg_next(out_sg); } - if (no_chunk == 1) + if (no_chunk == 1 && !need_fallback) return sun4i_ss_opti_poll(areq); + if (need_fallback) { + SYNC_SKCIPHER_REQUEST_ON_STACK(subreq, op->fallback_tfm); + skcipher_request_set_sync_tfm(subreq, op->fallback_tfm); + skcipher_request_set_callback(subreq, areq->base.flags, NULL, + NULL); + skcipher_request_set_crypt(subreq, areq->src, areq->dst, + areq->cryptlen, areq->iv); + if (ctx->mode & SS_DECRYPTION) + err = crypto_skcipher_decrypt(subreq); + else + err = crypto_skcipher_encrypt(subreq); + skcipher_request_zero(subreq); + return err; + } + spin_lock_irqsave(&ss->slock, flags); for (i = 0; i < op->keylen; i += 4) @@ -448,6 +470,7 @@ int sun4i_ss_cipher_init(struct crypto_tfm *tfm) { struct sun4i_tfm_ctx *op = crypto_tfm_ctx(tfm); struct sun4i_ss_alg_template *algt; + const char *name = crypto_tfm_alg_name(tfm); memset(op, 0, sizeof(struct sun4i_tfm_ctx)); @@ -458,9 +481,22 @@ int sun4i_ss_cipher_init(struct crypto_tfm *tfm) crypto_skcipher_set_reqsize(__crypto_skcipher_cast(tfm), sizeof(struct sun4i_cipher_req_ctx)); + op->fallback_tfm = crypto_alloc_sync_skcipher(name, 0, CRYPTO_ALG_NEED_FALLBACK); + if (IS_ERR(op->fallback_tfm)) { + dev_err(op->ss->dev, "ERROR: Cannot allocate fallback for %s %ld\n", + name, PTR_ERR(op->fallback_tfm)); + return PTR_ERR(op->fallback_tfm); + } + return 0; } +void sun4i_ss_cipher_exit(struct crypto_tfm *tfm) +{ + struct sun4i_tfm_ctx *op = crypto_tfm_ctx(tfm); + crypto_free_sync_skcipher(op->fallback_tfm); +} + /* check and set the AES key, prepare the mode to be used */ int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) @@ -485,7 +521,11 @@ int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, } op->keylen = keylen; memcpy(op->key, key, keylen); - return 0; + + crypto_sync_skcipher_clear_flags(op->fallback_tfm, CRYPTO_TFM_REQ_MASK); + crypto_sync_skcipher_set_flags(op->fallback_tfm, tfm->base.crt_flags & CRYPTO_TFM_REQ_MASK); + + return crypto_sync_skcipher_setkey(op->fallback_tfm, key, keylen); } /* check and set the DES key, prepare the mode to be used */ @@ -515,7 +555,11 @@ int sun4i_ss_des_setkey(struct crypto_skcipher *tfm, const u8 *key, op->keylen = keylen; memcpy(op->key, key, keylen); - return 0; + + crypto_sync_skcipher_clear_flags(op->fallback_tfm, CRYPTO_TFM_REQ_MASK); + crypto_sync_skcipher_set_flags(op->fallback_tfm, tfm->base.crt_flags & CRYPTO_TFM_REQ_MASK); + + return crypto_sync_skcipher_setkey(op->fallback_tfm, key, keylen); } /* check and set the 3DES key, prepare the mode to be used */ @@ -531,5 +575,10 @@ int sun4i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key, op->keylen = keylen; memcpy(op->key, key, keylen); - return 0; + + crypto_sync_skcipher_clear_flags(op->fallback_tfm, CRYPTO_TFM_REQ_MASK); + crypto_sync_skcipher_set_flags(op->fallback_tfm, tfm->base.crt_flags & CRYPTO_TFM_REQ_MASK); + + return crypto_sync_skcipher_setkey(op->fallback_tfm, key, keylen); + } diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c index 3d9c5ad6cbb8..a0ecfc8388a0 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c @@ -92,11 +92,12 @@ static struct sun4i_ss_alg_template ss_algs[] = { .cra_driver_name = "cbc-aes-sun4i-ss", .cra_priority = 300, .cra_blocksize = AES_BLOCK_SIZE, - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY, + .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK, .cra_ctxsize = sizeof(struct sun4i_tfm_ctx), .cra_module = THIS_MODULE, .cra_alignmask = 3, .cra_init = sun4i_ss_cipher_init, + .cra_exit = sun4i_ss_cipher_exit, } } }, @@ -112,11 +113,12 @@ static struct sun4i_ss_alg_template ss_algs[] = { .cra_driver_name = "ecb-aes-sun4i-ss", .cra_priority = 300, .cra_blocksize = AES_BLOCK_SIZE, - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY, + .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK, .cra_ctxsize = sizeof(struct sun4i_tfm_ctx), .cra_module = THIS_MODULE, .cra_alignmask = 3, .cra_init = sun4i_ss_cipher_init, + .cra_exit = sun4i_ss_cipher_exit, } } }, @@ -133,11 +135,12 @@ static struct sun4i_ss_alg_template ss_algs[] = { .cra_driver_name = "cbc-des-sun4i-ss", .cra_priority = 300, .cra_blocksize = DES_BLOCK_SIZE, - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY, + .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK, .cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_module = THIS_MODULE, .cra_alignmask = 3, .cra_init = sun4i_ss_cipher_init, + .cra_exit = sun4i_ss_cipher_exit, } } }, @@ -153,11 +156,12 @@ static struct sun4i_ss_alg_template ss_algs[] = { .cra_driver_name = "ecb-des-sun4i-ss", .cra_priority = 300, .cra_blocksize = DES_BLOCK_SIZE, - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY, + .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK, .cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_module = THIS_MODULE, .cra_alignmask = 3, .cra_init = sun4i_ss_cipher_init, + .cra_exit = sun4i_ss_cipher_exit, } } }, @@ -174,11 +178,12 @@ static struct sun4i_ss_alg_template ss_algs[] = { .cra_driver_name = "cbc-des3-sun4i-ss", .cra_priority = 300, .cra_blocksize = DES3_EDE_BLOCK_SIZE, - .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY, + .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK, .cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_module = THIS_MODULE, .cra_alignmask = 3, .cra_init = sun4i_ss_cipher_init, + .cra_exit = sun4i_ss_cipher_exit, } } }, @@ -194,10 +199,12 @@ static struct sun4i_ss_alg_template ss_algs[] = { .cra_driver_name = "ecb-des3-sun4i-ss", .cra_priority = 300, .cra_blocksize = DES3_EDE_BLOCK_SIZE, + .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_NEED_FALLBACK, .cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_module = THIS_MODULE, .cra_alignmask = 3, .cra_init = sun4i_ss_cipher_init, + .cra_exit = sun4i_ss_cipher_exit, } } }, diff --git a/drivers/crypto/sunxi-ss/sun4i-ss.h b/drivers/crypto/sunxi-ss/sun4i-ss.h index f3ac90692ac6..8c4ec9e93565 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss.h +++ b/drivers/crypto/sunxi-ss/sun4i-ss.h @@ -161,6 +161,7 @@ struct sun4i_tfm_ctx { u32 keylen; u32 keymode; struct sun4i_ss_ctx *ss; + struct crypto_sync_skcipher *fallback_tfm; }; struct sun4i_cipher_req_ctx { @@ -203,6 +204,7 @@ int sun4i_ss_ecb_des3_encrypt(struct skcipher_request *areq); int sun4i_ss_ecb_des3_decrypt(struct skcipher_request *areq); int sun4i_ss_cipher_init(struct crypto_tfm *tfm); +void sun4i_ss_cipher_exit(struct crypto_tfm *tfm); int sun4i_ss_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen); int sun4i_ss_des_setkey(struct crypto_skcipher *tfm, const u8 *key,