From patchwork Fri Dec 1 17:06:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749533 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="XgCkNjqL" Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEC81C1 for ; Fri, 1 Dec 2023 09:05:33 -0800 (PST) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B18o2dB004589; Fri, 1 Dec 2023 17:05:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=PPS06212021; bh=KVFlhhIEzQkUuWUDZU w+AZIRZgfRV6TG9bz6p6Jq+aM=; b=XgCkNjqL+vbUMefl481lGD1jvpuMsh+BsM 1YTKoUsaPr8DDz5CbDFkD1YWmvVYQydgI2K4j0wEIwqyQXX27avGNDou15PU/qrU mG1EXF3m9m4qlVr2CtcCNIq8wmUXD9e98N4M5g1Xyze746jQ0mCEnHZXASUsTvBG mY2BD+MGJH0zJfQ1FT8iIOpyu8V9Dr/TNu5oVl2iGUMZUgGcBeUCBBQoamQWI3p/ /IFZHEUi9n6ydRyWyyM3Ic6kUuQjXIm/1asigKveD4HKki1sqeoZgT3jJ+z0siXS Lasqk7G2E7jgo7hN5Xejetn9HKioGTu1jnck/MY9rN+hfriqS9Hg== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph0w9xg2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 17:05:29 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JuhRG8IQHFiUmjmyTq6Hmx+OEaaEkOAtPPpXri/InVX843b6abcOs6gbZ20rJifTw9RyIn3z0AyYtCGWkenJx2qLK3a5J7+tmOyhVFapBlPoU6m4o0HxdQT1Ug+fOdmpB7GPvCi/XWRCWPCVvfMU/WNagNN/9BySs7MehED/Udj+0rOC4fmapqbJ9wzMir+2dzs1C+Gtu5kRx1YokwX3jVUvvdSSihZQBAg+feiqueEEPJ5r+PqHnIgOLV5lJPBsuna7DRft1IFqpqnx25Qp0dxgao1yp+Dam0zt1Dia56cyspK4I3tqeHKCT2TcuvjzpgXHHHBjCpeY8bh8rioPnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KVFlhhIEzQkUuWUDZUw+AZIRZgfRV6TG9bz6p6Jq+aM=; b=F9F5Fn5ADBeUJiUObO2gWGu7FBT42IWJPLlZijKPcStyIhh4KCbmRDXZ+a/jLprzIxFF0UwBhcCc3MfYmmNd0918Gtzdrk+MCPyF+K5l8rjJERtDCO4QiiG8IMj/zT0Wny/tdOgF2RcGcjIYkH7Fl7+3bJN1p41xNDtjMolzPjK/4giwxqHba4vSMS7XhuJXqenmwLK3e/8sgwLvNvVhOpV9ftKusK2WKf6plGrDI/iJ5s0GnZqmd4kAC0ZD3FerVJSgqecB6dv0INEi5aP8Pqp79zC1VKag2y8kTWUtocY83095IYcBSovbSVQuG+/+pRRp6Xa3vgQ1vQZ75rIiLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:26 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:26 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 1/7] crypto: sahara - remove FLAGS_NEW_KEY logic Date: Fri, 1 Dec 2023 19:06:19 +0200 Message-Id: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: aa4a5ec5-6ad2-4126-347e-08dbf28fb674 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZZD7VDUK7b57b3lM8PnKheQh46BZHyxFPMg7BywMYM7pSSPVK1ZfFVKPTU+xsnbLhuKZJzDhrzCXkIwDfCWgmEsJv0d2k3mNQdkaCF2AG8oG7UldNQvjucv1znXLIwuabhDEIbl/0EMxDriV/pa3jUa2kA5heLnrPMzV89/ZzxXvcdsKLRY7+Q0Jj+8dokmdR8Olaj7kkCdz7UHggjPN+r3JcBPIJV97429fyYjqNKCciRx7/K0K/odo6XHnWAqFqdGCAVnRqleNlMOxB0Ml81IBxOTPY+KF44D43uyNsfXNovs7xaAmyLDrBGfQkrm8KB/iTueP5hRqxrYNpg4RkxX8YGeMMcKlLZpDEXX6JKii58BLXwHJvRrHSnFkEdiepWmWtV2hZn3Y8XeE3D3+2XjLAAfi1HNAWkaXiqOHCWOzmmN8SKerN/onPGNgESs6w0r8lZ4DAol8y8tgJhDXuNhEh+UeGzWvRDNN5TSYcXcOh2qhQ3zmmMDgwIv+tiRoCCTzXT0czvx/Hw0kDLxkkK0pDEVIdUL0BR4dG35WhMug3I9ezHrvzKphest8VQ9jMT9EsJWypw1KoWSK86De7A35U260BUYkmph6Im0biVEf1rZHiXIyze3/VBtdnCAJ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gDHDLBxKc4N7dnFQFrIe5t5Hx5h8+5HhEZa3bc2Clj5YiDe1P0AjaTrw5WjEnV09DOTaYX631ks2Bd1ir0ET+dycwFfi2pJ299pj/7+5Zk9tGIPzuR/ABhL2WGb4C7nMmSanTcBVVBgE980Kq49erMZNfxJyJDauqH8pGuLFXolRg6xu5MMIJIh3os5x9b/2OhMAdsqjsxRVCgpCHZAONT5teHguh17B3yJjWl/W31WohcjWslhE7Cj689o8ZVoM0IO/guVsYHAwt8ZbAzxHL1raEyv55jg3gfDDutPbf+XVe7FWTt11HaiGUtptsbONa+cmx+lUavUFd9TA2ibmAn2cWb6Kz+0QvYoLSOmc5sVxTnRHo/4WUoiHYHAQOphMjKRTw7vsD/tY+tcfsp4HhSgukll+dJM7syjabtR8dS3i7tpH6Egh6VOhhy3Zlsx4pL0n7p5tyqGMBo6H0w4xA3sNeccK6XFZK7lehE330T6VlFRLV/+vXybupDEcyP9BryDoo9HBjt1WsbAzZIgEhERVkhZnDse4vUH1WwHCVT+wt7oJpKFPJdi7kk0WAJuQ5gbt2LYn5QrftT4Eastls2ayhBuoxMcqBIGIniL8GfCxmP43JbiKh4ZY8hlYVXbIv6NNf7PWctWS+FeG0wa/z/wg80ki+HSHQGTk5zt1wJ0E9jEVu4yRsWu6qlxIFK6vxDg4G3jWTdpWVT3v1CY7bRCn9bNIn9tQu6hRHvCGdyRzWVr/20PoKzLqpm8yclma40xL6SU82LTaGGBXxCHKOkTmIeiABJNWBXSkxXPIoND/9UIJDV6UOBQud2gpWi75WeXTon4Xfr8eYFuMgR0GxtNKbfAP9Lw9QF23hwmAA11SnrsrGYU+PyuG108dkT5E7iIGykuIci/cLwTRTHrkADJlTG8kDN/tfQvxWLoDfbyDkfTI2Iwas2TtXtNm76bwnJPd4NBCXV5zoSqE2ZYhYEntYQG6Hy7MZR2WQPCfju+aqjt/GUPyKn6CsJ3YRcHWUFHDUWauV5QNLxupzVuJKzxYNUybd0qzFoHv53YFrHxrzRUhVMV5aCWoMQtL0P4iC+5x2KhCic1PmY0b+yj7AtLD+0frXM3+U8bIV9wCGPPN9ZCQHjS4HlFcica1uoL2PjMO34Km0IRPul4RW175dold5jrHa22njvVPc+SfMpXgq5uE1ihUHBOWD8zJhJ2GK6j6V+TjPeHWZyNonbYZU+rg31FdOQEjeUGlC+a6tNz+Hv75DkSl8+j1+yvSKgTEB1I3A5LN7CMZVnc+qo8ZLjizdhseo6TJjrM/+8n59XQSz8KWlOFm0mLg2M80sCRpU5CcgUhY6+HhwUH1n+1Ox7rFn2bLToTtMXoqkE1t9IS5XdUB/zhytOOZZ+78X7pLbcXCZOFE4Yiknqep3gglaWyhdHlbWBsQ0zu0Ja9gbhchtnDwKaAFZyvERFPFYWqThQjhrO/XoD7npOGZotiy9rIsqJzhtgQYR8lIvIKk8xSo74+PQodq0tMlOZ32vm4xzMNkTgchAcNUnnOjODh78LKvr2pxHtuSeU9lfv6o6xYK32oTb19T7J3SvVH9Q41a05RYJyQ1aXeF4eKq3K06UA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa4a5ec5-6ad2-4126-347e-08dbf28fb674 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:25.9862 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eoa1b9GrYmuWsmrlkPiIsPbp0EcaxtsvIKu8HzBknlyB7vkTfjbABygxNvnn2e61j7xv9hH9P0io6J3KtZ8vOGwOYIA53YGVlTJM7DbWsog= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-ORIG-GUID: UiiOHEhsHCnOG90mXDlR0_vRA0f6f_ni X-Proofpoint-GUID: UiiOHEhsHCnOG90mXDlR0_vRA0f6f_ni X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 mlxlogscore=999 impostorscore=0 bulkscore=0 phishscore=0 clxscore=1011 suspectscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait Remove the FLAGS_NEW_KEY logic as it has the following issues: - the wrong key may end up being used when there are multiple data streams: t1 t2 setkey() encrypt() setkey() encrypt() encrypt() <--- key from t2 is used - switching between encryption and decryption with the same key is not possible, as the hdr flags are only updated when a new setkey() is performed With this change, the key is always sent along with the cryptdata when performing encryption/decryption operations. Fixes: 5de8875281e1 ("crypto: sahara - Add driver for SAHARA2 accelerator.") Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 02065131c300..5cc1cd59a384 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -43,7 +43,6 @@ #define FLAGS_MODE_MASK 0x000f #define FLAGS_ENCRYPT BIT(0) #define FLAGS_CBC BIT(1) -#define FLAGS_NEW_KEY BIT(3) #define SAHARA_HDR_BASE 0x00800000 #define SAHARA_HDR_SKHA_ALG_AES 0 @@ -141,8 +140,6 @@ struct sahara_hw_link { }; struct sahara_ctx { - unsigned long flags; - /* AES-specific context */ int keylen; u8 key[AES_KEYSIZE_128]; @@ -447,26 +444,22 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) int i, j; int idx = 0; - /* Copy new key if necessary */ - if (ctx->flags & FLAGS_NEW_KEY) { - memcpy(dev->key_base, ctx->key, ctx->keylen); - ctx->flags &= ~FLAGS_NEW_KEY; + memcpy(dev->key_base, ctx->key, ctx->keylen); - if (dev->flags & FLAGS_CBC) { - dev->hw_desc[idx]->len1 = AES_BLOCK_SIZE; - dev->hw_desc[idx]->p1 = dev->iv_phys_base; - } else { - dev->hw_desc[idx]->len1 = 0; - dev->hw_desc[idx]->p1 = 0; - } - dev->hw_desc[idx]->len2 = ctx->keylen; - dev->hw_desc[idx]->p2 = dev->key_phys_base; - dev->hw_desc[idx]->next = dev->hw_phys_desc[1]; + if (dev->flags & FLAGS_CBC) { + dev->hw_desc[idx]->len1 = AES_BLOCK_SIZE; + dev->hw_desc[idx]->p1 = dev->iv_phys_base; + } else { + dev->hw_desc[idx]->len1 = 0; + dev->hw_desc[idx]->p1 = 0; + } + dev->hw_desc[idx]->len2 = ctx->keylen; + dev->hw_desc[idx]->p2 = dev->key_phys_base; + dev->hw_desc[idx]->next = dev->hw_phys_desc[1]; + dev->hw_desc[idx]->hdr = sahara_aes_key_hdr(dev); - dev->hw_desc[idx]->hdr = sahara_aes_key_hdr(dev); + idx++; - idx++; - } dev->nb_in_sg = sg_nents_for_len(dev->in_sg, dev->total); if (dev->nb_in_sg < 0) { @@ -608,7 +601,6 @@ static int sahara_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, /* SAHARA only supports 128bit keys */ if (keylen == AES_KEYSIZE_128) { memcpy(ctx->key, key, keylen); - ctx->flags |= FLAGS_NEW_KEY; return 0; } From patchwork Fri Dec 1 17:06:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749236 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="W0hGkV93" Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AED15F3 for ; Fri, 1 Dec 2023 09:05:33 -0800 (PST) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B18o2dC004589; Fri, 1 Dec 2023 17:05:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=zNQhHGJGNQlpA3LdVx2jyMiVNoU21ERR1ZpoWGjXzW8=; b= W0hGkV93BRkFza+3NGYOFL7rCVtCDXApUhaNaB6ynjuEjPalxLJfXXa7F2EumZyS gFcrzwG5RYUzDtdzi0RggnGW+dLopl5vyIkYkyd9sKUc35n4LnakEpzkCOnTW6R7 GzMN2nseXRihAR6/rQvXYidSANl3OyfsqPQdCxdjcUk/2ytXWHCVncCIBxIfDKx1 QADeEV4ZXs7ZYVAE1EGIp8krnCbJozKiiSCXOzw2XZ1mvLLK/CzEQOBWfetOduk4 se7FVqIGxT3C+5k4C5ySdhmvnbT67v96kbJlcvyIm4DYln6/qUIckdeRL96x4dZY A20a93Ck4dzf7kTJ/YA6sg== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph0w9xg2-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 17:05:29 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fhyjfHPYq7wjOPPkxI16n1ucN8Xefbc0LLdVUoP/QutWYfNP9bnV7KL8TTMckP3xrsB8E9/Z2xCanb9DcMjFCBeUPg9jzLsT7F6pahY9TPwIurNdfqFy6N+Qxa1HITuk8V6PE9gkx1UFvb7xSl2tWr0BRcpFeLiAqDwhYijjcP4thfBM2+jL865+oGWmPlNH22yuCde1z8VK+pmZbq+hg/O4/Nq7BmBH8yY9rwixlDJv4JLgCpANrhjFIUPVOvLPkfg5JL8ccKEn7SNWCvMhpKnAsJTrEhXxzXffg9sR3BTSVsPr78q9sLa2Nx2gwtococqdMg72WMX3jleh/DsNww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zNQhHGJGNQlpA3LdVx2jyMiVNoU21ERR1ZpoWGjXzW8=; b=Md5YOz9MkXcTuAm2Dsq2JTUA8QaEkEkgUJgpymI7k5aFYqP45aFfSnNMG220xOND7w5UzbUzLLDrikyZbytZ7tYov3vZy5EUMDWqjw2qBXlW9okF4J6A9IoJajLiUf2ZtWIhE5JbTiWJNyIwuEbHHS+CqRC0yy1r5MlBs+/1kjCA+m8AZbOMqKhXaBiNHcHoQcMqcd9faBZTKaoRCWN3g3ykr7ezMQTute5PoN4Pjw+6HHOO+mO1ycbbjagGTZy+vWhr8YTIHXjQzBQ7K0PtycCpu3McJ8qCuzqrA8PmCQ1lpQTL1A3WHcAqywP5v0HCfBQLzp1JeLZwkFM6yqaklg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:27 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:27 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 2/7] crypto: sahara - fix cbc selftest failure Date: Fri, 1 Dec 2023 19:06:20 +0200 Message-Id: <20231201170625.713368-2-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201170625.713368-1-ovidiu.panait@windriver.com> References: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: dd6d8ce6-3535-463c-9195-08dbf28fb730 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GyO4h7WutDS1OGe3wyPfQDgGeK10j9lBPlRi6QSPFu/fXAZj5GaOBBtejLDURPA27kgJs4ZvRd68Kmq1YwW1ucfgSwUBD391vFtH2zaC2fAJlB3+1Ifs61fXZ1APrVLkVw/AaewIH/cicfWzmOw5+wy4AnV4U/YAFaLTbEWZeb+D99s3x3IibWJzoPCI/aamYvJNTkE2EMJb9gMtLajmJrz0gekvDF4l2diQq8yxUOsuVuyZX7N0LoMMb/3gNJcQi3tg+66hjNs371NrJO1/yx/FxwsanT4ibKON5wZPLwy58mZ2Gz+5oZ4Db/ZMu0jB+wXOa9IFuXESw+7njK031R1zd1CdINg2cchvSzi6Sw0IvQOrubblXkp+NUDR1WCgjTMi1KDztAMDaCRifP7X4TXvLKIPwa3uusiDwV7uoAJ4TZr/gG723ag60NdUen7ETsc0MVaxivnClfldTOWfccNM5pPV41hSUi6Ppq38a+ak1MQ1Bm+c/3cif+OGVpbyR8vUr/BeIUFhyC8M7cYJEaXLwPpFj4gt/cNsSbBFKYsvKDCDjPs3y/M4Db8gS3LLhtIkSi1h/aoIoMs7rw73CqqUaMQqN2wB0BvAXOJaKwPNBpJjtIS78Aswbvu8k/YD X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2GhHNhBem27pYclydk0nIekcuKZ4Z2BS/EYnmtPFjuPB/rwxO6dmBKTfeRzyt1tVO7WIW28xQnAL88kvKi2GlKVtdK5t0w0WJkbPMd9EdeFx4/dSmh/hn6RvV9kWyZGwIyh94fC8IaGMxyv48rYV9iHWLN8qOiLUUcMln79kOxy2W/Jx3GZtvBhgE/YM2W9bS+ibbPu6RHkEx3UMYzGoxZAUsSCdvVmgbu+9gzm8DEt11HWYfisA0AJ/52jPq8NLI44uG8QeObczbpdj9ZKVnClLYW0KRchuNHFVyAPMdPW83SQOOYax1YlOPTPlaPfrgSUv2GKZY4CtZc7KoRD1o26SzQyMrlvrvVGmkwzhwWttWriR0KNx5F+oTd4biRXCYiByOufsRDu+7h2nbT2WjBwvZGwElxh9Mq+kJ1EUbUtGVzxz0KoNfeaseKRZpPgo491P/HLdX+SpRgcXpyjSQwC+TW4kl8W5nDFC1tV6c+0AICKSC1dglNk1m95Mitunf9mIGlt25/Xcy8Uu6/pWUa6PStV7kQGW71q20ejFvKcMrg0MVz9lgU51DHYZniFzjRKHubxNAOxWRsRAa0Sg5rE8xT5m5Lb5WwtqURljEHNsKf8SQhQQDq4j6nH+z+THyZsfsulGeABu+WwN2BCYyTIMJijL8j1EM/wLuYwf6ifMaxSsXE8u1wzSf90ETt0F781I9jri1cOZIz30WEgD+jKyngj117mApzSE9kHz29iP5iJysv4A4gZVLEAQ7LeQSqO93oeZ28KEJxU1m68dCqPkN9LPfbgbAmxHXgNxYPDHt25/ItpLeSti/qM9JpX3I0OxzAOUfaavmLYVimWL4D6hRQYMicxplEgEX6A0owvppjE7MEviY9nbZuNIhPe8Cj+V5qErd02aS+/7meL1zcSNW8DyqW9q6uDgjKzbJ0bCKGgGlvaWeHAFtN7ZzztoIF9BTu1p9OQFOltTe+LIu2jEnpvD7dmkJrnnc5PXmvVCMTl97esbeEJjuooYZZzWsfUa4OmHuLvnom2Ji/zP/6a+H3WRptbPGF4GRv28OGNogWdTxbID09ZhhBNEBffLaINCVaChA3Q8FrahlXYy7/ZTxd6SRxZ4VEwm/0hwJVO/uXKtZYLvFhIXXGMkJk0UXLhnpcYTSkZpPU7lSmi0w0ZmrdEgNjAzvZP86+ieFhUPRbtLxPILIOfvyQhWwor1BDWrPDM28bQVAvT7Borr1EMp2giyD+JAZq3pt2DUaFAJrn489NlvtoFb8cBiMIc2nbRt9TXS9GVDyDyGqRzGx6GTRMIp0mRrM2XHp2mpkXRA+rkwEE7rsN5UsrRQXAY6hdMSSD+9UHVz99188TEWdm5Nvr53v5/dTlrvnzhy5/MQkqJVCg4K6f7W7KzwjMgwyFrVGq9iswStpc1O2criHUgwig17AQVGhsCJgaa5534MUmcVkTnWA1+/6GptdbrMVq0H6Ym05bgjS29+qavvifI19bARkgQm9bZ2ZY+YbepkVXiqTbTtrYtGeVNtIKTHGiPLk0VN/sql/STdzmheYBBOmNPioCMbQCcTkyxOTR1ODqqHxVTU2Y7SE4QaMmsDOIAqZc7dv2em7idiqXMU0A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd6d8ce6-3535-463c-9195-08dbf28fb730 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:27.3159 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4d5IqPXXBxV3/q62CyNNH81UdTZVjpym6yTY5wMqHQbbXBtxMGBwR3CzWVf39EWyaiUXvUGzJqzAAWQXokz0Rj8S/FYdebTQ/Cm+f+GqJ8g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-ORIG-GUID: aojkc3LqJR-wOZ1lSv2BPFbIgWU_RUw3 X-Proofpoint-GUID: aojkc3LqJR-wOZ1lSv2BPFbIgWU_RUw3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 mlxlogscore=985 impostorscore=0 bulkscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait The kernel crypto API requires that all CBC implementations update the IV buffer to contain the last ciphertext block. This fixes the following cbc selftest error: alg: skcipher: sahara-cbc-aes encryption test failed (wrong output IV) on test vector 0, cfg="in-place (one sglist)" Fixes: 5de8875281e1 ("crypto: sahara - Add driver for SAHARA2 accelerator.") Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 5cc1cd59a384..888e5e5157bb 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -148,6 +148,7 @@ struct sahara_ctx { struct sahara_aes_reqctx { unsigned long mode; + u8 iv_out[AES_BLOCK_SIZE]; struct skcipher_request fallback_req; // keep at the end }; @@ -541,8 +542,24 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) return -EINVAL; } +static void sahara_aes_cbc_update_iv(struct skcipher_request *req) +{ + struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req); + struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); + unsigned int ivsize = crypto_skcipher_ivsize(skcipher); + + /* Update IV buffer to contain the last ciphertext block */ + if (rctx->mode & FLAGS_ENCRYPT) { + sg_pcopy_to_buffer(req->dst, sg_nents(req->dst), req->iv, + ivsize, req->cryptlen - ivsize); + } else { + memcpy(req->iv, rctx->iv_out, ivsize); + } +} + static int sahara_aes_process(struct skcipher_request *req) { + struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req); struct sahara_dev *dev = dev_ptr; struct sahara_ctx *ctx; struct sahara_aes_reqctx *rctx; @@ -564,8 +581,17 @@ static int sahara_aes_process(struct skcipher_request *req) rctx->mode &= FLAGS_MODE_MASK; dev->flags = (dev->flags & ~FLAGS_MODE_MASK) | rctx->mode; - if ((dev->flags & FLAGS_CBC) && req->iv) - memcpy(dev->iv_base, req->iv, AES_KEYSIZE_128); + if ((dev->flags & FLAGS_CBC) && req->iv) { + unsigned int ivsize = crypto_skcipher_ivsize(skcipher); + + memcpy(dev->iv_base, req->iv, ivsize); + + if (!(dev->flags & FLAGS_ENCRYPT)) { + sg_pcopy_to_buffer(req->src, sg_nents(req->src), + rctx->iv_out, ivsize, + req->cryptlen - ivsize); + } + } /* assign new context to device */ dev->ctx = ctx; @@ -588,6 +614,9 @@ static int sahara_aes_process(struct skcipher_request *req) dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg, DMA_TO_DEVICE); + if ((dev->flags & FLAGS_CBC) && req->iv) + sahara_aes_cbc_update_iv(req); + return 0; } From patchwork Fri Dec 1 17:06:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749238 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="m+S5nHXx" Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE5EB9A for ; Fri, 1 Dec 2023 09:05:33 -0800 (PST) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B18o2dD004589; Fri, 1 Dec 2023 17:05:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=EMNwhREwIo0qG0ds6HPK6BNCxOSA+02o5lgwM0TLT/w=; b= m+S5nHXxv7qjhb0I4hWggOY6ucuoP+cJoPEpO04XcdxYIivhFA47NP6Swn5SKolv 9K2eowcExB5d7HjlmthgL37tanq40G/7c/lGPBo2CHU5mZHO9G2akq2KvkYePGcd yAuOLGie4ZbIONkKlQfJLQEDRmbUgFGU44L4iH+whc67k/FZRjgWsPiRQVX9nzbz jVSZ5RVJxHNTwU+GjwTfb85TVTNYT9FGJB0stuRCpA3RRYLTG3MaEKfgnw7yxfJJ ura7f1QqFY1kCkXnGStB5rzVmm6TgLDEKH5MIGn5Y6UiPWA6VorgTjc3rHUatoaU F7HUrKliNKsI7aXPU2upug== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph0w9xg2-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 17:05:30 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q7h6iHqq0oNpTY0cSkpZj8ELm7CI3B7mJsCbkSbQX6vtWla9f2dlAOmgfWqr9tv4bbJ0u3n0am0StSfXJlqGiUOE75KjLdCT9xfnoOstbILsn7AgsZxoXUGn1++4V0fDj/vg2SWjiYbwQe+qM2hxBIXrkhHOOfQAxP6iQTn+9HjPP0XI006rOGnnXYMEKpfBxiZSvsdNX6vTNFpeiUO1A3nN/RppoGQ36VefCXHU1khDGFKBDbzcrZoElnMz56OWQDFTz9RCvjgwnRKZZvHBBvCr8dcNKfpZW7b4uw10uyIh91OIymiD/i1sgrQEi/x3S9ENyfQacrgj3kmPHW1VTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EMNwhREwIo0qG0ds6HPK6BNCxOSA+02o5lgwM0TLT/w=; b=fKTKGFTgAnX9dHv+vKwjhyTf3Hg1rEfaXAI+Gdn9jRql6ZU3ak3EUj9HMtqJLUu7+J8wxqlv2M24BxB8MxwIifAnSn1a1yfgGqVDBirJiGMsSJfOcAg5T0RrvHsx0j8hdNx/G7I1RE+EC7jh94t3U9Rx/mED7Hf/z4IKS9fXWBOa35GQG4bmH1Vat3k2zI0n0zOLTCzzox+DV/LsBVAXnWyJa+d26W0JtcqS8mz00jGuejVDLpYVJZGbngCEWaC1DjgqqUbjaAWjgCRasr9AmaI+wcxysbnUElFsFob8njtAfC113XgS5O+lolqf5QnF2L5vocobx6Fs04t/09O20w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:28 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:28 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 3/7] crypto: sahara - fix ahash selftest failure Date: Fri, 1 Dec 2023 19:06:21 +0200 Message-Id: <20231201170625.713368-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201170625.713368-1-ovidiu.panait@windriver.com> References: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 15974be4-1a4d-48c0-641f-08dbf28fb802 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AbaCCKdLm/uetg0I6f92r2yBrKExsFzeHDOeORxBxmK6Huwga1nTgKwTt2EInKbgA6xFVJ/Mkz4NmhFZSxYKgnBYUun3wRIK4CH4V5zQOYTj5pVz110sRnsbu9bihg9ECoVTwB7iiyUcjLePKQx3S1GX2ocPYoD7ta3wueoHc1tVKSAQKREIdeHmkUyrn6rM7u46XNoOi8NUJY8dO2QKRWdJg7K9rd+3RrSqbFVPYrd8D4he1bPhtO6j09Bef90BDlX1mVy6huQUSQd0J7W190jao/BwYdfd/mn7YQSflLToeoJdZEzh3/CGRfRFImbJu1NsaJhY/ELyQhAHD+E5t7GssouKKGCRJPFfE6AAkQ/few6RVYHTwSC+mEDLAQJOsJcM7y75PetZlEvU86x/Mc3/xJI9WivFHXqCC0DKClh5k+xpUjVn9Rc/BqxGCB/0fnB1m07SRcIHHrS57xbN0lxee/ohagzlZ/ONfTDRnfon0X1RV9+McrFgYr4knyabWZhZXM0HHigLrwBvJ47N1Z3csbCQR69wJ2vKwuD+p26ywLa8QmZybYl6NltbAcR0W8W6rH6xVFPZMvIE83SrtF5+p+jgPkHqNfg0mZeh+labI+vN6vaO4jqSV/70jB1f X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y8I5BpOIUVVugnI68PNaVbYAfBsWO+blyExcKFHri90wOIrCZ/MM900Q2kQNPwFEzwjcl/nQEiS/zHSORKWSQ/aWc/OdsssG1H5QwbpvYxuDlH2xIdzpV44QCXK/mftg+qrVqrAW/NQU7/Or4kEdfkOnVOgARv9ZZOzPZ7R3mVVSlHN/tF4YG3NcD3+R/XHQRqgCcXkpbltF7j1C/9jFZ0vcAGxOywKx1/pjMeOwtN7rh3DgUJz/DWD0zteQPHFV7Cf0cFOpVDJc9Pl+vWbYNeaL26LsF3nQ+Nb+fsXqPWwCD5IzpwWPJamIQzVlypEEABONGZJtVqigSR/9UW5ylhcwM2jvRINn3kdk8IqqjrA+cSdFzr3M70oN9ANEkEG4v+BL37ER8J1afp00nJO/WqhWj50UPHhcLkpq9P4LyhKoCJLRLC+dZeJhuRTzYzFhEsqe1hwXKKCXTvaVR7VKpLvYnwl0ufra53HLxMKsiUa1nbA0tjIhAFzTzxl1c1XyN6w3/PcWuYoF+es7m7Mvj+aLEDnLajHwYl06vbZBhsDNYF94Xd0vMSqjQqwGxc29GN4omo5turyInTZive1EKjb1CaYPcMzihh8Y0Ic62pzWikry3NfBPaXI6j39WeR1UvkEgrgUwd8fba81wkva2VOzCr+aGiJDZfJf9bjdoFcu+XZPmBcBfZb7EenGgEzy30I95Ohq7ZmNkwR9DU6VVmDuWXFsRoWycBwQJHS2Zz6ppITOtzara0BR/eLL4MUR8yLw4Cjq1xvj6F9z2rXCaORv75dkdbc/qZGl+ldASuQYtZkzh6X4ZRCeJJKH7rgqCnakmFIq3BQcu2dbQ3kj+maKzdGaMCKbZWrTwUjPcu1LClxJXzUeZbUpew27ih8yQjQwyHzgBLo7vfFj+2RPVV4nSXmHldRLYU25qwsQCgH9nXDWxp22GJEvBYpexT7BpIpBVxn8+DNJTe7KExCzz9F/qH2P0IpnutaL4XyOTvmvl2Lu3xe2YxGz+0TXDMGzOcwAMBFeupFHzQWcjB6ksFxQPlzFEIW+2LEUOULqPrBNFUx7QgZrfat5UnSknGoTXhl+rvG17ouBvs7I5gFfTmXURE3IyQvZa4Ay/NCo+TTKUCT1ZIu3e0V3/aSAfHAb3oTwp0uDaLmcZ+oxZ8P82pS76HEK3BAP1x6MABRfLl720WRaTLAXiNSE2S2U5wY1wAiegJLt26kSy60oPYp834AwHZ7VGzb9bwbjvsHqkVhfbnHVhg9o8Azh25nJpZDXthI0QIFLJVRJ21OyIubpKG5cpi9HnCq/q5WSdZlkWU0f4hm7mIG7vqvsW5Z6+o1R4gm1DeszJZwlmRggWeZRuWES7sAqEanOWcr4N50XXQWQHgAsmI/xaV8IxC4tyY3DniWTDVy3qaCSn+dkeve6lFe+QqGV9Ls2bAhLyjoPEv64ZiUhmMlxiKFm5GduOlF14jcKC4X1Vj0yMWFoqmwu6KA/BVU2orVUpQspD7ndz8sC4noWqNeXe4ACnnuTLHnZzAWWs+/bDQf5j/4fT35alETI7dvkLHfWIuuJuX9bfrp9a/3SkiJajeBDAuPbYsigFGLaklEYSuHKqeE+LsOCyw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15974be4-1a4d-48c0-641f-08dbf28fb802 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:28.7321 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jvfybubGw0sAdJ9siitK+BGritBnJPkzk9MPxHr6rsWr2tZfigezjHOni0H9Veblc9OcM1GdTu9chyuJQr78u/ZcBdxzMcC2h9YxMESX3Eo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-ORIG-GUID: JDGTmlwLmtGOtECNSKr_pdA0uYCvjk_4 X-Proofpoint-GUID: JDGTmlwLmtGOtECNSKr_pdA0uYCvjk_4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 mlxlogscore=990 impostorscore=0 bulkscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait update() calls should not modify the result buffer, so add an additional check for "rctx->last" to make sure that only the final hash value is copied into the buffer. Fixes the following selftest failure: alg: ahash: sahara-sha256 update() used result buffer on test vector 3, cfg="init+update+final aligned buffer" Fixes: 5a2bb93f5992 ("crypto: sahara - add support for SHA1/256") Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 888e5e5157bb..863171b44cda 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -1047,7 +1047,7 @@ static int sahara_sha_process(struct ahash_request *req) memcpy(rctx->context, dev->context_base, rctx->context_size); - if (req->result) + if (req->result && rctx->last) memcpy(req->result, rctx->context, rctx->digest_size); return 0; From patchwork Fri Dec 1 17:06:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749237 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="NL9pnYT5" Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 539BEA2 for ; Fri, 1 Dec 2023 09:05:34 -0800 (PST) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B1B31a7021960; Fri, 1 Dec 2023 17:05:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=WllgItLfHitvRna1QQ1b9KYNGztVqDTUjtTy82DSRZU=; b= NL9pnYT5BaXezECsaJaQ18rzeIT+931JWZEVRzrnVBzZz2mar+zvp1DXBAh88PHC MX3JUVhq+TzBD0zoDi0Z1EooBtMgD8+Ix6r5uxwwOKPE1DLYlAvynzROwDc827ta jnznZA2P7y0CnFVnJdMv72SyprfkbEoWhdYii+6VGeadTcd29ZRbtLz8MKwRSGGr 5zUkspHNzmV7Jugr1A6NzZP14r0kpuLDSGlWdQIi3zRQMufEKYIgZx0YmFy0kyMv JBOkEuSMU5YK3uowTgceK8KTybgTSeXZx9YYlDl5SoumAnfpLokIGjXSfXF2cQfW +18ImfL+Kg97vneCoa6Pcw== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph0w9xg3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 17:05:31 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TSLEwYYVNlc+RZAFxuqO+2/ntxWoGylnOstWWoyH2T3WKlU+9JeguIMtsP3NrsglLqH8VY5gLJyaj4lhh0bdcaqWpQgnq56FjYXD+e90/k2p13f+lAwN/oeQ1QPY2e0/wg+fHCtol8h6RTirZaLofabjJ/zLC1dd+/+yNhit3Tj1gs5mxyqd/I2OhwZ5A8YvKe3Fnd76vUDJsuLdCiMkKpRNCRtmdVHfpugunwio1wbGDJGlBt0ivcoaUpSjgpSWU++XQtSyNvA7VdzsataWXl17viMS+l+gqjz4DtAeSAkDBSScuyGdai+x86cJnoC9c3q0O91d6NayvhG4hWY2Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WllgItLfHitvRna1QQ1b9KYNGztVqDTUjtTy82DSRZU=; b=Z+fkrtziol+/JVxxrieEWLdYMLEiop8tQrkcAdb4lLVpOtYYA77TYFbTUMythgV6WPH3UZkeH1xJ1I3skT/nZbQP+SVO2+RSk8SxOTkslyc3bSGqzhRR14P9U4SXcCN1RtIvYqgGaYDp7zRcmTHyMGXXkLISYL1atbeIOy9oyhcV4Mr5P3YD53XULJ6tX5n1fciZ8zCk9fnCxr9fREXV/zuMYLRmgR46WTcpTMlPMsAr/Wlr4NFVQOd85GDR8hDURTyXsngnNeqPRSccix7i24fYNsmiswZQZGdeHCcTb7e0V2Z7gq5BAtEloTqX8Cw19s7Sb/NzFXqeQtdj/2TKmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:30 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:30 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 4/7] crypto: sahara - fix processing requests with cryptlen < sg->length Date: Fri, 1 Dec 2023 19:06:22 +0200 Message-Id: <20231201170625.713368-4-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201170625.713368-1-ovidiu.panait@windriver.com> References: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 56e0134a-6d26-41da-d468-08dbf28fb8d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9UAG5zZM8o7wZfAil4KFsWzkDA4l9+hwpIsyYlZv4qG6WE4JyfOsq1/e1uXB6rYvdpLrAFOAeVtkZc00ombeKB4AcR1RTtOlIPdgJiCcsjgu1m8UcpBb0faPbcOyo8kL80052ZYTtrwxOfBBzcCFIS43Lbj2WBMHO6uufFXaBouyhVuTNq+tbJ4rTJi3peXu5QqMtqivY8hkC5EkgKg6zYoJEZOIHaHJvORQB6B6ywvTLvDgdxYuCEk7cEHiEgvnCkHebMK0j/IdJRl61HyYX8PmzSfVqyX6LYlw6++N8aSGvDDFbptjDkX1PzS2X4G10Qj6bSHbcIL2DpMAmzxBIxPyj0+bA5vPf93iforvAcyqSOjMetqIt4xbEejrA25P4XUHkejuPesno+zoIH1Z+Ht5xkixf0nlFv/gzk3kIhgQvW/cJ8GYI/iMkawtLMars6G4qHNp0HV/+X4jQg8iaIqma+9PBelrxFQseugYtCgN2GGmlFX9cvE+WaXM88ELoDqGQjKT1k774Fr0mgYEKriQYxLcFA4wRiDAP2HgqzdK1SBbTQdOs5f86bSqxHu1JFuVwmXkqVdtAqglKzS9iT1fiN3dDTB908V2L0qT5IEPGUp+CcxKrX7BjkJQztGE X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LV5Iyl+uvcF842uIOjdGmo1L93DJACW0+jqZ0I3EiE/U2Dy4xi0+Y+t4N5CynEPES9zOKakVT2u741NHjikH7Qyp6WXqE2/TV5lFSWFO5z0wLGmTR9WxUKZl7jGmL5DGYSjm61JKowCHesP+ydyDA8xq9E6ZBCiXasI2Dfnk5Ey6p655KEV8eaLvSo9+Ul7fe2VNOKskruqAtm2zTsF8Mlqk9c/dtGGtJFzoaL2KpErvxELvyRINQ1smrBJRnuSn0eiNLTHjzrAsoppxj9PDOiYaS/9LLHDXYGbRenxJvaRLxsj7Xs0v58wF+eZu1zndXxNmZ2kSuIejkNZ/VDt794LNWLQvC/GlD6y0atwgrNgiqgwnhh553gN+Hf+AEwGNqMJdUVDo0dP/Hln9uqzhhG83FPIVBY33ECGvIqGP+rkE+sFTFqJ3UP98JSS1/3RZ/5nsI2+cztTxwd5yOuL7O95IvIsZ2aD9WsdWGlRcRCndDFWnmtr8/j2W7g+U1sPRqOhvCLxbgmcUKneCTHfkWz6Xpr7pf+bGh88CF9p2lHXZk1lAhsLIWlP2RU506JecpANzUVuCZK7Db7k53jt68muJShtrUj/6s4Oybn0mlPS7+H9OK2T0eU8vLMTrsbt0dEm/t8OWB8b8XEzOmGnfzizhQNExgIx9T2gRfSZPpGcHManB0ilbRnjUWrjP6A1Cu0K3Ep88lhsnYm+lcHPFlULg7MthV9q2KMpEtAShQw6EfKe276zwMJ9Ka2IXE6Glr1zPEix9MHIBbLTs5P9hdeOHE0Wy3uVF1yDcgNmlspWjXEIqHegjNuY2Gf12Mc8fvs1SrQuZtM7CQ7bitWYg+HtQCbZ9DijGTgoQbWwehuBTZ9C27Bd91x4Y3GK26I5O1TOgcn/fsArZP7UOvqzXCJ9i5poB7Ljtlgmiheg9zZlOAhXVg9yREFszgNxD0exYh7fFdm4sI6pfIY1FujuPP1fMIQAXz5oljzwfB18+i/Ns+gStalRLlgM2LYeTXe0DsYsa1fITXwIlkoqdImHOqMhivwD+Iyq5FJYf2UESfHkCr5CofKaM90bFGWnP2tJ7w70Mt+kV4K0aywoeDmBVFOxmdcA3kCLpUbXh+6BorMjC4Xax+Ue2dOLbzuqBYpOeDqcM2v1Ftyz18AjK6XLS2ADsacl+6fkJ4tjgs2amjkiVeGsIRyqH4TRTq8I9OP4kq55GA82WwsL9njvXX1MASzp7P6kLGWbOJkTDimxhJMgdtTYnebj5l3Ff7r0uWHkB/MTZM1HvPERj9ETyLYFGba64i7UNgH2bezrL/v4dNry5zHtVMeLijZrCp3OigfmmOkULU4BZasiRQibORhZEFD+cwsRypx0IE4/lA+gXULjM05Iqk81MXPnu0mnAsvKLidQZZP9CMgHeXU7mjw108yiXxwnT2Erw0RgSXWtpXgIfrwQLxJk4J8g1uQaek8mi3sl3+xCZ3I0SKO9YtBohIUl82k+MZIxTSc9AbTooqa7UZ1azZygyBAdLFHoCnHVtUsrruHB2Z1Y/PbS6H1bQu2cxPmcqaGUyDtiwG4w7pAmH+QyB/+Q198XNRLh9f8g5+ZBBycwPtHG0UvtoegS1Zg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56e0134a-6d26-41da-d468-08dbf28fb8d1 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:30.0380 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EI98gIIlkT/2mD/g/HkieWUHtTJOwpqd9On8W4b93sKD5ER59ujp9cqEkcQeHRnsbNniPTBs96CPWXn2EYm+QZCO301mYmbGjoXEgmB4PdI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-ORIG-GUID: -ZiTCZnXw1RhaPWcJb-fI45CpycIfMO6 X-Proofpoint-GUID: -ZiTCZnXw1RhaPWcJb-fI45CpycIfMO6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 mlxlogscore=999 impostorscore=0 bulkscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait It's not always the case that the entire sg entry needs to be processed. Currently, when cryptlen is less than sg->legth, "Descriptor length" errors are encountered. The error was noticed when testing xts(sahara-ecb-aes) with arbitrary sized input data. To fix this, take the actual request size into account when populating the hw links. Fixes: 5de8875281e1 ("crypto: sahara - Add driver for SAHARA2 accelerator.") Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 863171b44cda..cbb7153e4162 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -444,6 +444,7 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) int ret; int i, j; int idx = 0; + u32 len; memcpy(dev->key_base, ctx->key, ctx->keylen); @@ -494,12 +495,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) /* Create input links */ dev->hw_desc[idx]->p1 = dev->hw_phys_link[0]; sg = dev->in_sg; + len = dev->total; for (i = 0; i < dev->nb_in_sg; i++) { - dev->hw_link[i]->len = sg->length; + dev->hw_link[i]->len = min(len, sg->length); dev->hw_link[i]->p = sg->dma_address; if (i == (dev->nb_in_sg - 1)) { dev->hw_link[i]->next = 0; } else { + len -= min(len, sg->length); dev->hw_link[i]->next = dev->hw_phys_link[i + 1]; sg = sg_next(sg); } @@ -508,12 +511,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) /* Create output links */ dev->hw_desc[idx]->p2 = dev->hw_phys_link[i]; sg = dev->out_sg; + len = dev->total; for (j = i; j < dev->nb_out_sg + i; j++) { - dev->hw_link[j]->len = sg->length; + dev->hw_link[j]->len = min(len, sg->length); dev->hw_link[j]->p = sg->dma_address; if (j == (dev->nb_out_sg + i - 1)) { dev->hw_link[j]->next = 0; } else { + len -= min(len, sg->length); dev->hw_link[j]->next = dev->hw_phys_link[j + 1]; sg = sg_next(sg); } From patchwork Fri Dec 1 17:06:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749532 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="Ivf7DcdR" Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77EAD103 for ; Fri, 1 Dec 2023 09:05:36 -0800 (PST) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B1BuDX5005878; Fri, 1 Dec 2023 17:05:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=6bt2Th3bngJ+FIXOXX+bqCZ876eCmJ8WSuXXzQJW+Pw=; b= Ivf7DcdRICqTLs9IL9J1R4wQzR/LF5yrm4IMx+20Yyh4yuyR4uq6lSbxTRbv6Sle cU8cCybUEw3t4gRVovMvtnURaT4/b09RxvUueuBFZjnHZcs+/didpMAUBeiFRRiN SkNW6effmQahcO/3t/07cdsdXD8+/Hv97pOx5kGJJUS3nt9B9tVogE5zeavrdoFl sLFMhsygo4cZFJSAg6nAZP/y2W1z1bpjDPDgqTmFko+VQLKCBgJbelfKOLcNk3uK +Qgvg8SnEbIsbQpEQg4V861g5efOBlahzRSeG1oBSkY4LtIb/66E0lP0SYHo7J4Z t5Xkkpp0t/iN5j3kHKJO4Q== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph109x2f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 17:05:33 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=icEazFGz5gyesQWTsTe5u48yeyAd4iKix4x89p1vtfWNJU+swTjlP711/o9NACyzMLXE3uoWhdYDRCsEL9fe8ivOWZordNGQ3JZJI1NoMaXYlCtFRV/GmUR4pmSOazRIU4HlDFc8sT5ztTyGY2b5vytsN/Faiv2/JBIiXbDw2HpUWGhgA7BwDtCyf57IXAMhZ1bxMZMnxpVsE1azlV9ESkuwaRF8pnCdcWeiB2UXlrymVo7RRPmNIrzNIoOmah+JEjKcHI7EWir/+vnRIbM6OyoIbWto0YUpjwm0HJqbz0ACYFjkVx4FIafLxCIJ9CFJMch7psZZ9TIcYU69ou8wDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6bt2Th3bngJ+FIXOXX+bqCZ876eCmJ8WSuXXzQJW+Pw=; b=ocNjELDatwAlWBnc9xnlyLFEt24j27IdMkjG9R259++n9kAgmcWhfpdfqjdNTVuqVqmvP5jIwY00irtPsYcZTFUMv+Y2RyYUlFko4b76DXf16lNzWF2I23clK8hAK1H0xn8ceEHcMtzdG/0zdeg76Xb3TAYrMD04hrK5Df0d+oO9mkfMANpMVlkYdu1w9r+yEF74luYHdrxqhyPoL+KrSy9LWOSUXJcb0+MsKWzGCM53OP+FRhnTTmFXTuCfzIxHHoUhrxxFF51Nh6SAOAK/SrYxA8kI4bZAkOEPfx+EXRN9JnJAb/N2Hfnx63UJFQ8LQtCFOXMvCRTUdOpK3aJeKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:31 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:31 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 5/7] crypto: sahara - fix error handling in sahara_hw_descriptor_create() Date: Fri, 1 Dec 2023 19:06:23 +0200 Message-Id: <20231201170625.713368-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201170625.713368-1-ovidiu.panait@windriver.com> References: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bfa03e0-89dc-41a4-badc-08dbf28fb997 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZMEIBH9zlw0XAVg0tE7oYcbcHRTglxRIhMGidzk6vU7hIgNQyP1ZM3BalDlUDGPblQE3+x2ptSpWHCW3RvxF/AJChvCTiIhPXyLiYiSNky+vJ1vHUAp3HN2i8tPNaBKWFpPtw1CS67zTDeKJTSetR8SCccXJWcxSUUg46MLKYNfWvZhCPegxDM0zaZnCKhm7OdQqrmFnyXuPhk0K0k+O/sQttdfEvDQciBw9ELkzaJtlEKQ4etcyduToYzLchbeJWrvhzjtUitacs8qEodEvHwVX1AY1ER0SCGnFGrHJ/Va/JtLiB7EDhrPWUn0Rmy3u7qNGYUHhivC9kKk3W4n3iWFxjtGdLFRMPwj+OKME5MMbLRUd+iDdXDeq1x15m2WJdh329QVIVKnpzdiVXGZhF3+40YHWenoZVSgGMJLQxH4cu4pYb/5vknAhKZ80S2vBmwyH3xppL//fkY6IAf8a7L+c2obOZOvs4OX/nKE11kpW3Zcg+U0JvZjyWWiff1RjWQgRMJDbhBxuc2zMBF1o9oimAafj4Sc9lR3VutWRuYQak15VP+BiNtIfOi57Nq8P0rLCHEsz4pjXsa3grtV6+sE5CKLrZhKz4yUlXxyrTWHSAcxnZtgdfrsYZ/FPuNyu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FMnrZyN/nhKevoVzKJQKbKTdzCpJxBk7rIre6pDmmNAn7zzMXUZh9X4bsTInrr8chHErULh3D24Kk4U9z07rMnwKUGBOSOYUNMEa/pMy45qma5H78XYLjUHDi6B+we4jjygHHrt8RnjrODIp0qhrfrwlb9G2dBPGPm/ARfHsD8DYhpnta6AGcGz5MPtTjkAieddm9REaH6BQPMdVKXB8MowVzoXHF/KbelNOWLEcz6S6b+/FonB697HzlkVxHfqOI9gPwPi8+vVittJK29a8P2kbNiouQ0WxwLeMmZDAWnN8nI0j+UrQdtAF+KlVQj+TYFXycfXj++DB3ecDSShXu6gaZ/NZKdfZ1a0PkoXEJw5bAOAZv2UpLbBAUtwZyxg0V/c+c5M6rnQwGycqFYObnaiecXuKPAhpojHQBkOcV1ZVzsqi6mgkE1nmAZLVYf+R0z8QkClA6wzuylTpFry6ygjf+ifbFWqoIHs7zHEvyKJQp6KfIk53nqg+I4hGr5A8GiS6+uaBcXdNPMNVCXWrq9KS0EujWoimiFms7ywILTrhmyhzWkPC8TQIkbZ+gPELBPCDC4UdedQH6sVXKg6AgfD+6EBAEtzfPKptJRXJ/lMLkLjdHH6LrPYfh3LPEAu8WAXaBOC5PxVATFJyzN9P4NOK4nC7hSxuT1KWFEXMMgnLIG53DXoMQQ96VLDqM5lFBK5JI3iBRp5fEztRfP1LP7HqdDZzie8wEUSHLiqj/az8xijug5CpaNZ+2hoszHTkFACHYEnAZNlsW6fdi5bi91dH2jjRnt3N8X6DA2kHEGWpvZXvPqfCedJUfKDsbU0pAPpOt9xBigBWSlhawN4BUKM1eDYztnOVl5LqoQUQHBvhIprAiGoRKdyNOySZoZ24bk4y+Teo0cYNDvIkEKEAbxtvbQBaHg8RUBzHZDFd1vHdvzFVyNOfm8KPWdNY3WRe5xO3xiSyuLLYexZJeGZ5iC3mtLpDlWqbQJeCx5p0G5ZdV6dI8OvoB/9HaVlrvP3ubjfn6s33btiAivnYYBPMDPYzS1BeESHvvuSoWrnnkbLDDDq1Nw2FV0aQPLacaP+W8kvfD5LWoqmVAL3PJpxQJlHdIzSN+3PCLPwfZJEufX44H3zhfSpVf87wlJtDLBsUKsOR35bL+LTl4aXRCGfm712fFgFUwHPPb7apQq+Z6wlC/LgtNlZ+qNVOJ1gIWZPOV25JQpxKa4Xs+vsy33WfvVXJ8ejg6HyE6ASliJLgCHIs7w1pvzKXtESeXJL++2Cd8tErUoMNQoO2GAym3vanyYN1oWDxZAy7MGS9AHgG+rFyfveKniDEEYn2hr9PTlQPHbiOJrp3cG9QE5Mg+RosnsInUg+hQGCkqo68qfcljKv1Jf4ozvwC7UUcpL34d/h2SdlZfld1oJM4qgVkyco0R2XGf736iCYWVBzgj3paZiSnsTAwW4DGNSWMK5v7IcFOhQU4Ce9fiEDTsYt2nkzqUycWKKgtNXs8qPM9SHrY6h/JQV9Pc+rZ2tcI2CMEz3uO8gcVN+fqMAl4s0GLmWTtCdvubqOKxTKrzcC7AeWUE6guXlTfQ5E7616N3hhx5ZJYV/YAdbMft4D9yOeB7ZHZfA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bfa03e0-89dc-41a4-badc-08dbf28fb997 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:31.3962 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: brW94UhFwvhfzuk4rNYBgvX+Qg1pHoE2M6mBpMJozxMdAT+8BCBRzG8t5wnZ37yZrdNEHJktbaOzbrENbnh0zU0f152mvShF5enUxzXKgIw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-ORIG-GUID: nmaumHVsulRMC6l2kKD5XHPC-KTBYyK2 X-Proofpoint-GUID: nmaumHVsulRMC6l2kKD5XHPC-KTBYyK2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 mlxlogscore=773 malwarescore=0 priorityscore=1501 clxscore=1015 suspectscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait Do not call dma_unmap_sg() for scatterlists that were not mapped successfully. Fixes: 5de8875281e1 ("crypto: sahara - Add driver for SAHARA2 accelerator.") Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index cbb7153e4162..c4eb66d2e08d 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -483,13 +483,14 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) DMA_TO_DEVICE); if (!ret) { dev_err(dev->device, "couldn't map in sg\n"); - goto unmap_in; + return -EINVAL; } + ret = dma_map_sg(dev->device, dev->out_sg, dev->nb_out_sg, DMA_FROM_DEVICE); if (!ret) { dev_err(dev->device, "couldn't map out sg\n"); - goto unmap_out; + goto unmap_in; } /* Create input links */ @@ -537,9 +538,6 @@ static int sahara_hw_descriptor_create(struct sahara_dev *dev) return 0; -unmap_out: - dma_unmap_sg(dev->device, dev->out_sg, dev->nb_out_sg, - DMA_FROM_DEVICE); unmap_in: dma_unmap_sg(dev->device, dev->in_sg, dev->nb_in_sg, DMA_TO_DEVICE); From patchwork Fri Dec 1 17:06:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749531 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="iYQa6ko2" Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39CDBC1 for ; Fri, 1 Dec 2023 09:05:38 -0800 (PST) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B1BxksI031433; Fri, 1 Dec 2023 09:05:35 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=D7UmrCIvcNMj8HXJGA5Fd6jNtukmSic7DgMTQFOrIiA=; b= iYQa6ko2HS0dLLKHxSLnkscTiWB5EunRU1R+xK5YfYjXwXntGzIZ5vT2LLJkN1PC 6GX69ddmdFxRJvpG+yODv2sKLqdZmIYVbp0bmQ+qjRxQ8iqTarWKaGcQe+Q9KFk/ hotO6RqQNawB8hfm0yVrwxKb9XOUSwYNdVd4e+LM9Jz0SC51/smdr8x3z0geo89S crxj7vRdXhKNk39cUbF82nt1CHyvsqecEKE9QweGX8aHJeYoi67R9lRjDTtYJTi2 zhjK6QzjDao/2KDnx995e84EoBbWjjNQdCPHlrLYUF1047ftaWrDRerTPjIViqE4 dYPpw/1YD9OoWdtXzXag8w== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph6dhynw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 09:05:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M/yoCvtHIR/7hMluiLYjDpmgzllX2sx1+P/zmgEyUk97xDwfyI3pLDWH01ApwKqr5UATAPEzfJ0Zo2upMdPig85atuU3tEScPT38qQD9lKKFASmKNPt8UZh6XWDJkSH6O55kL7S+VklZlgQk8uofhejdhffOCNuh+ZCmUSfb296aAkA1lXc1aNs5nvYV1MP8cPgV3WpJdW1EWo9bvm6PptzkIs1HjwYLMV9cg/Cgoz1SlWsvU5JwF4qsCmPWtLIQmgABApaf6egEzhyHlUMBKOIdxEwv7EOrx+xfey3Xyi+Rr9dHqS/xAuS5Uor5bE7aues10aCet+N9B/XtyNNf/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=D7UmrCIvcNMj8HXJGA5Fd6jNtukmSic7DgMTQFOrIiA=; b=RyPrUCvb2khsSmbV2wafZF3BzhI2gAlnXcoeKyl3JH19PMbsuzw3OIjP9A54Q2UYlErTyVyrpvJiWxnbUWjvwG05OBYAajGgnjc2uI4zNOpTKD47lw6PyyoUHzqZThHWF2TpB10rQHZtDaQnIr5m/+wX5ypqfyvk40tTRQdG0tGF6Ycct69M5hEks3yj7b2eD4cmT/rf+0KLolarDD9XWZzDaitde36H+3XoPvi4qSAVEKFgX/d44aHOY5Bz5P87ojhrX64+8VQ0WsaIjOof2HtxT83KYHiMR71LWjrI4bd+TLJOT95zApuXmsJb8ZBKI7QnqiELSriSXNZfVEyWJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:33 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:33 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 6/7] crypto: sahara - remove unused error field in sahara_dev Date: Fri, 1 Dec 2023 19:06:24 +0200 Message-Id: <20231201170625.713368-6-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201170625.713368-1-ovidiu.panait@windriver.com> References: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 53948754-0a00-4a42-efed-08dbf28fba6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AZijcnum8uS+Qfi+WmzWdhwGLAVp08guHTrcLGNDYPkrQTRArS/YkW7c/WDdYLkLtB+HKA8l6Vb66EtE4alTMOhU/jFrdEALaVl8lW+WOze3xfrHSBX+4k04dyzrSrIv2F/FMEhffhsLQ4H0Q8lCRUmBgQxwp97Hg0+joACfoAZ99L86QKmm3+IaMBQ3Lpwsg2DUsqCUn//eEPFom3aNpB75brsL3c0AdTJEQSpnDdUNtoL/G50pqDr3Jd6eIAs+8qmCdgAAwLdUQc6J7bI6iLTArA5RDMfB4TCUbag399EkEXHo9KAncNYCbSHgxxjiT+6gN2EhpETlWFRDgHmG1nslnyn9X5+vLtPyqsag9OqtIwyuRHncYhaV9QU+cI22FJvBJJydpOc86iuuiq3ByYgfGrtFmaupUDwQ0a6Y++15ClTCQu3V0ju9Q+xAVtDy05EdCfDRUObbnE8jt04vTr8q2THXm9pwj3lTs5q336NWGj1gjC+Bm8h7mHYOk/ou6x1HG28AwjVQJYENqtoBrsbP98eheGr63BSOetQmANNwOGfrGAyfiHHKYkTluYizV/zBHU04NPFji9X0aMTCZhO9+8klPwqGTrsY5uUP/nqHWGD+iy+MezCh3VWaGlMK X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: agIJBritzzsH+Zb/Dy4cfNROTS9eKhe6ijn71yT7TIuWwSTxo2lI4HqcqxQNO8asQJTzz3DmkCqfS0X1XzVZJsDSGeUvebQZJWrxRZqOUV/on9ToJu8q0auNsCytFNZyFXBXUK6Th0hraGTKqOtx+blYiHSGZkFEimiUsb4bXG2ShDcfKqouQtQ4J3T5OJqTa/HpivKxptiYZIRuhbvzYBVSBBidTt08nWPQbEtiCH6rxOATwYAsKSqrSowK3qf8IuQf09u6N07xR2jcomQsA0060wJIZvcADAz7SE3pP0ZyVJz9tU6ZXUAR837HqGlRy9F7gw1YkGgbocKhEmqB+IAFojCYv37QewyParJgHdmflQdoZvY7S21BxzQzP/Dyg+dO1BaSng5Ea7s8Cjk9+qBlbYyFPPKHfg/AYpQWDz1+DmqA7x9EwYu80MqtsEqNyPNBe6UtAdoSQC3nDpsH0VrXTRiwm9ZcqxPz6/CRJYEyjgsQgTd6TnhkCJ+ZzC9p5cUMGx/eMLwq32IjqD7zGbaMyDvir8l9Wr8fkJpwuep06uTxVy7/M5tbEPTl4Crrx6VPlsZjvr6K1pyJR/EdJDhUMzjle4LFOWkEHMqEYymVbqJByU9DNiipC8XJFUPQ8uX7avQgkAMQ6KkHKrPjZ3lWpcmAjKSPROtwpRHLLHTlHv/SO3dAXcBM3oFtPEOy1NI6YDu8VhBhsWvMI3kqLOQewZiQHl1T0sSODhaNrC2ZMJdoJiI9tOuYOpGydUMsEnpXcmgiLF/CfcbpAmdy4Wk7IPxQtf1T2AOA9y8/5FVNtCyIJUAVCryAR5niH2kM6U7pWNWrUH2ANkxXZP8blk5EYOWxkSSLkB0wyayzTYxstpDTDODQGzXw+H4ElIs25JlpZsN8qD2RSTsz2YA5pciuu+9niFEAyCyiIaKtC8y6JPnXWoJY137cGalEQRuTCxfLLxQxkpjwjPVz6yyB3F8qI5Ff9nhX51SOFQ2mOkcizpW0vhJI0Cz7QuQWfKAZ+vUfjy6DURveSiebdhnJSOopkJRWbpyCicguqSME7EXB1d/r7at2vTX7yd4DzRGKdxXvbR0GMwsB7I7KyGroiCsOpqxg6SJzWud2euodJS6TiFjCCo7DLThQj4XtIxJKPscsZGdm5bI33j6Fs6BqGPMUvgtdV87IheytcQO5E+EmUro9KKN+exGdgaiqF0wMoDYZCLSqTv53dVi3lTeq/np2OHNRGtHYUA0l2dn9/IC4JXXuonXY2Z9rn7P1+QjCtMxvo6DZ5tTH9F1PZ7L55UhEjqUntLDDIVZSR3mMfkh9F3spjH8isBJShO/+YNHk0Qn0sIBUKUNkXdYZQ6dWrFODGDkuIpcvhPHJgbS1600mxgMQTkbje1ry1lrdMPZti0u5llqmwM/Cpv1ca27BpeOZt3NdVmZ2qxhqv71sHugCcHp8WYvOT6fxT99HDfGP5bX3oY0lWebuwKpBOUQoIWYSnqcbqQSW+0frI2xprqikiNuqXVvr7CzMJGGUA02SYLUNwplZJIcDhYv+U48KiSQmNZAFcd/4u8Rq/2+eHlyCF4LjtgZ3X8Rw0EgkjucP8IN5MpPiQ5r/WPxGkwxaEg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53948754-0a00-4a42-efed-08dbf28fba6b X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:32.9433 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aWFrmc99NY2S9GoVWNII7hSfn+inhEquDwai/xtXVISebL2OSrJnnFAJ4Hc0il5j3xQsANpfVd63h/dwLwaoBvnNycafFhR6lNgmxrPT01A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-GUID: ZgohnbFnbRFVN17gNxT7FnLc3PcA_u2z X-Proofpoint-ORIG-GUID: ZgohnbFnbRFVN17gNxT7FnLc3PcA_u2z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=964 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 suspectscore=0 phishscore=0 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait The "error" field in sahara_dev struct hasn't been needed/used since commit c0c3c89ae347 ("crypto: sahara - replace tasklets with kthread"), so remove the remaining references. Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index c4eb66d2e08d..2f09c098742d 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -221,8 +221,6 @@ struct sahara_dev { int nb_in_sg; struct scatterlist *out_sg; int nb_out_sg; - - u32 error; }; static struct sahara_dev *dev_ptr; @@ -1302,14 +1300,11 @@ static irqreturn_t sahara_irq_handler(int irq, void *data) sahara_decode_status(dev, stat); - if (SAHARA_STATUS_GET_STATE(stat) == SAHARA_STATE_BUSY) { + if (SAHARA_STATUS_GET_STATE(stat) == SAHARA_STATE_BUSY) return IRQ_NONE; - } else if (SAHARA_STATUS_GET_STATE(stat) == SAHARA_STATE_COMPLETE) { - dev->error = 0; - } else { + + if (SAHARA_STATUS_GET_STATE(stat) != SAHARA_STATE_COMPLETE) sahara_decode_error(dev, err); - dev->error = -EINVAL; - } complete(&dev->dma_completion); From patchwork Fri Dec 1 17:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 749235 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=windriver.com header.i=@windriver.com header.b="U9Rg1HM7" Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 104589A for ; Fri, 1 Dec 2023 09:05:39 -0800 (PST) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B1BxksJ031433; Fri, 1 Dec 2023 09:05:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=UnsECkqUT+/3DWRvcVeGt3HH/CvWuLerCSRGP34RJJo=; b= U9Rg1HM7q3/X8oF3+WKcUfK2J4nBqtN2h4rHTraZOLTt5fOja0q+7awc8JYL4AU2 WU4Hme9aE3yEkayE2QOZHL/0ei55ibpLUgrtry9qYiEYterb8iIeHvv/1wMkKaR7 tNZu69ljHfJipTyMuK5vGw70BWyYAOvzhG445GgiIilGdOet5xE2nKwrFvjE4BIp 3n5qSSvj6ZVlDCkl/v2tL7uzTnMWyXP8Ho+Rk3Erx99UOEQZJ5cDq0qGmMOaFa+J aiHU7g+vNK3pQDF+ymOIVPWKghTCk2DR/ADo8jwmg3K3joGdzupMTBawUrdqF0Ta vPyrmV1nBqXtGbPhVUBTpg== Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uph6dhynw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Dec 2023 09:05:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eDGI2JC7vjqbeLrxO2OT7jD5OKFS5rn1JhzJNuPCs1yad6bmO50ggfisQTYV+YD4QhDiBQE1HZdhOmyWR+rusQrVNCcpz2VkwlZaoI1oU6rfMelOXJwLJHAhoPN7GhV8UU+iPGOB5iGloePH1i38e0pW0AsrJX/TS3jz4Q4gwMlJKtyu84QVhcPoleFq+GxsIlLqLBDXA7VFRvR92x5YBsISGL9ffMPMerO8Qc4imq4t+407pCVpeg0ZXKZEZrZDbBbNsLYnvXt+e2SWzrcNkpVtnyaqF/rxuIcdK80mmOqTpKjXbEHWI9OX2af11XViiT+mfL+4WjzpWHj9/Ntf3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UnsECkqUT+/3DWRvcVeGt3HH/CvWuLerCSRGP34RJJo=; b=Mqbo9fYAOgQ8ilgdNN04pWhhnbRQSrAXVKHNT/qjYqr+G0fGDQid5H/NJacsybGYlm9dozD4FlNISMqQxQCR7qBSuwJLJbuhwSjbbxYlCBm0LiIIL7AwGJzdrUzAPq9cDLXy8nlOxUCzNslMs5R7Y+oJSW4j8DUEww7fSEbFdHntseDBtepc661RjIrztZYOISrZUHFOzkYXEqZSVxqwbkEE4/e6V+WmKoI8Anc3wbrU6MvcbQbuSEjQqc2CZRcE6djRUSfUA1U3FATQJTEiNuY5pA+Uov/RwIF8XUzcY0P5PxRQF9QRIUR+kG53IWDPEUXiJ7JK5jpvEK4Fd73/6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by CY5PR11MB6115.namprd11.prod.outlook.com (2603:10b6:930:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 17:05:34 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::7c2e:5b95:fdc2:30e%3]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 17:05:34 +0000 From: ovidiu.panait@windriver.com To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, festevam@gmail.com Subject: [PATCH 7/7] crypto: sahara - avoid skcipher fallback code duplication Date: Fri, 1 Dec 2023 19:06:25 +0200 Message-Id: <20231201170625.713368-7-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201170625.713368-1-ovidiu.panait@windriver.com> References: <20231201170625.713368-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR07CA0244.eurprd07.prod.outlook.com (2603:10a6:802:58::47) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|CY5PR11MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ce4f1eb-0cec-4d26-0fc6-08dbf28fbb6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Kc+3cvJZ34V+kZ152vXqVCtXGf3E6xnEQQumXd+KaL/wkhy4WNR9OJ94f7Cz6KF2RoEdJVhMWHCCMW73QLPXojVTUAUyICC/6XI4Kj0aj0H1IM4WcM3Lp7KmmGR1D53+pE8NVMDH2cn++6hutCVI6Py4xzkB1iZUQEi+mLAbfmX6l6XQkuxL+72GR3D5jFNqJVt5R9HGGl7mrVXsWlaxod0ZZgdA/YI3AT8VFrWmUf1HJWZYJws9EFIrof9TGKcyfezJUP+l8ax5Bhpxyz8B7PONTRAe8pKf3eKN6ewI1I8/cTxXqSQUsHbi5QRUEPa8ojqWwwN9f8XN6h4/w1c2A/8BDMMPHvgZypnUBRlQpO9fKo88KzzisVlHtVDlj9Etd/ZHHRcadaO1YgFzptG+YXnZyn85kHKJW7bQ+qPtxMobzskeh96Q/SPE0AtKnFyrrug/P8mVzoZVNCQ1i/QtChcIoguYaxOIJhrQoOryQlqK6sqMLNnnuMnOB1ufCMgDTZtqJKIQucs0pFPPi4Q4MZ/jLPV8i2n4AIGFARnioH7An5oTkJNERdx5yfENpxnsmL1IEx2MGTEfdLSjqnk4ZlrXEYl5IaEMZ29QrVupX52HVHgVMleqth7vehvwqBu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39850400004)(396003)(346002)(366004)(376002)(136003)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(86362001)(6506007)(26005)(9686003)(1076003)(6666004)(52116002)(6512007)(2616005)(41300700001)(8936002)(8676002)(6486002)(478600001)(5660300002)(2906002)(4326008)(316002)(66556008)(66476007)(6916009)(36756003)(38100700002)(66946007)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ECKJzvkeiDiwXUyPSbs61reYL7PgH2tzW0fQJPWNk5IhWls5XHlbXjla6nnw0wolTx19E2OVPO/AZ5uGB2sfbo5d1j8xctGEsPfqhJom3w4vL2VT3vSQ6jvkuiv9A8jRZYZxGj27MYfR5lAMI7JiluGSZmFzpQxfJbr3dGJMfizfJP/qcZNyZSEbzzXsQuUCea+K6u6ViT8xBGcYqs0cip35j1FcOeN34PZ4nwvLsA9FAeYOAN/1NlriOOx2ioPxi+C7F7Ro/Z0xNH7HusI2g+26LOsCIr+DpNLqo2ofLydOl8j9UtCguXNr7S7XS9rcX5Ib2wmFr30aVcx5f1QkLEmyozcW45d3hJbW/+5VbVY2KcnlPmfL70M7oGQrB3bKA0Fhr5Ce2IUtGobz2q+cmuGCF4utlxqZmV3kieM4NgMrLXo/gzbkgusXw8VoHKgxsQYxPH6rbkQiGXw9DFzyKKzaIT3BAdVZWRHYFX+Xw2GnKRaeyZ2FMDcajym/UOJZ8md4rEAxn7xm81VTgvkng0lu00T8K8x23gj4MZMbuHIlthD8WBwaWm/q1OMyjl6v/kqBp0CzRDc6oTf0kZFTbt6jU2ZaZMmVs9AUDDFFiTBs/COL9vkFIdPKswze+dDO37zhUwCJSKFhL8ofAMAZkicsZ5bn2dhU415HLmy1SBPJRQPGJHhhXZGqZz5FhKou1v3udSgnvagyqw+T/UrI7u32GSAfIDqoagFKF0kGgVUBZuW0d5RI7sOLnhP8n5CpuB6gK8a1S39B1fyYNkvkf/hmSAofi3g0CYWUvgjgk+jb6+skGeT2sLVm2h3xeHjYV0zUmT9rNcrLr44oLixildE683ypk+r3sokotplMzDTWSBXmvgvE6FPaQBOx4YS4qd6eeE+r/8J89JN4pDBavWC+kBCAvVJeRsixH+JtHffiIG0xMjN1zKNJdgeyeCp8PCnQ+KaZS8vCZKveOGHiWQYOTUGC5G/47PpCYwXhpHxcbpAWTEAS55Q28iAhm3Mw5lYHFuMn7LZWXcScECXHqU/e7Zs7yXt20sYWbd+Q+S76LWuwFhT+YrMADYA8x0rcnWN5ls8fG1VRJEiyfhP5Y+siTDMG9ho5j7KkeXWJMcgEDE2/TZQ6daxdEme8rwbHJJ6SbPBdG7UyrC5LOgQpkz+v0AJbEXG008dvHfv/Zs+kbAL/RpaZK5F5qtzp3MRnm+LOYX794AVqBa72UFABU5Cyb5nEqdgWzXln5AU/7ATw3g9Mx4nJ8CN5YtY8SljcUBSk3iUpONnyEJ5aDX1mTGFwYCdzvUvkXOIH6ry5+pzl4QgLii3F8skM8zdKlX6BJslJPDuQdnEzvOHrRBrZFqa+GaeNBBd98UrA0JNkLL/2VfmMQK7e1IXnPTIm8DELiQB8Hz+1USVe6hmbk72eIiYCAtXc/oQcGXE4Qg3zNBvjvWlO0R6tCTqZtYNsj/6rzhLGcQhvb79PGtGy5yNeoO5HFJHpdHCjhZBG+TnQ3UyoTG1zAmyKR16yx1vtgQsvwOTgHBmwJ9ZGGPM9Cq+CJvh+oh4zJe/P0utqI1zwCHhrjU5B6+pb690vYtcZPGjxABCmigS2kjLILns93xJMvw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ce4f1eb-0cec-4d26-0fc6-08dbf28fbb6b X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 17:05:34.3492 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PYXDwXvNEQo/5+QRn9v8oUPgYxeqZZvqckbblSdx+LvivfFh3HJev5TZtsjS/pIaLGKhutyjD8pCzP+C5ueCIQidi6qs3QKtI6vzybyNjgc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6115 X-Proofpoint-GUID: UIkYWkjx2WiwRuWztWoj90IeGFsB02-8 X-Proofpoint-ORIG-GUID: UIkYWkjx2WiwRuWztWoj90IeGFsB02-8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=679 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 suspectscore=0 phishscore=0 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311060001 definitions=main-2312010115 From: Ovidiu Panait Factor out duplicated skcipher fallback handling code to a helper function sahara_aes_fallback(). Also, keep a single check if fallback is required in sahara_aes_crypt(). Signed-off-by: Ovidiu Panait --- drivers/crypto/sahara.c | 85 ++++++++++++----------------------------- 1 file changed, 25 insertions(+), 60 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 2f09c098742d..27ed66cb761f 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -646,12 +646,37 @@ static int sahara_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, return crypto_skcipher_setkey(ctx->fallback, key, keylen); } +static int sahara_aes_fallback(struct skcipher_request *req, unsigned long mode) +{ + struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); + struct sahara_ctx *ctx = crypto_skcipher_ctx( + crypto_skcipher_reqtfm(req)); + + skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); + skcipher_request_set_callback(&rctx->fallback_req, + req->base.flags, + req->base.complete, + req->base.data); + skcipher_request_set_crypt(&rctx->fallback_req, req->src, + req->dst, req->cryptlen, req->iv); + + if (mode & FLAGS_ENCRYPT) + return crypto_skcipher_encrypt(&rctx->fallback_req); + + return crypto_skcipher_decrypt(&rctx->fallback_req); +} + static int sahara_aes_crypt(struct skcipher_request *req, unsigned long mode) { struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); + struct sahara_ctx *ctx = crypto_skcipher_ctx( + crypto_skcipher_reqtfm(req)); struct sahara_dev *dev = dev_ptr; int err = 0; + if (unlikely(ctx->keylen != AES_KEYSIZE_128)) + return sahara_aes_fallback(req, mode); + dev_dbg(dev->device, "nbytes: %d, enc: %d, cbc: %d\n", req->cryptlen, !!(mode & FLAGS_ENCRYPT), !!(mode & FLAGS_CBC)); @@ -674,81 +699,21 @@ static int sahara_aes_crypt(struct skcipher_request *req, unsigned long mode) static int sahara_aes_ecb_encrypt(struct skcipher_request *req) { - struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); - struct sahara_ctx *ctx = crypto_skcipher_ctx( - crypto_skcipher_reqtfm(req)); - - if (unlikely(ctx->keylen != AES_KEYSIZE_128)) { - skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); - skcipher_request_set_callback(&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); - skcipher_request_set_crypt(&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); - return crypto_skcipher_encrypt(&rctx->fallback_req); - } - return sahara_aes_crypt(req, FLAGS_ENCRYPT); } static int sahara_aes_ecb_decrypt(struct skcipher_request *req) { - struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); - struct sahara_ctx *ctx = crypto_skcipher_ctx( - crypto_skcipher_reqtfm(req)); - - if (unlikely(ctx->keylen != AES_KEYSIZE_128)) { - skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); - skcipher_request_set_callback(&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); - skcipher_request_set_crypt(&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); - return crypto_skcipher_decrypt(&rctx->fallback_req); - } - return sahara_aes_crypt(req, 0); } static int sahara_aes_cbc_encrypt(struct skcipher_request *req) { - struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); - struct sahara_ctx *ctx = crypto_skcipher_ctx( - crypto_skcipher_reqtfm(req)); - - if (unlikely(ctx->keylen != AES_KEYSIZE_128)) { - skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); - skcipher_request_set_callback(&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); - skcipher_request_set_crypt(&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); - return crypto_skcipher_encrypt(&rctx->fallback_req); - } - return sahara_aes_crypt(req, FLAGS_ENCRYPT | FLAGS_CBC); } static int sahara_aes_cbc_decrypt(struct skcipher_request *req) { - struct sahara_aes_reqctx *rctx = skcipher_request_ctx(req); - struct sahara_ctx *ctx = crypto_skcipher_ctx( - crypto_skcipher_reqtfm(req)); - - if (unlikely(ctx->keylen != AES_KEYSIZE_128)) { - skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback); - skcipher_request_set_callback(&rctx->fallback_req, - req->base.flags, - req->base.complete, - req->base.data); - skcipher_request_set_crypt(&rctx->fallback_req, req->src, - req->dst, req->cryptlen, req->iv); - return crypto_skcipher_decrypt(&rctx->fallback_req); - } - return sahara_aes_crypt(req, FLAGS_CBC); }