From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3878504-1523241879-2-11682582979645733748 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523241878; b=cZnmSXBumcco2Px6Ps9fQor4he3FmdTq7M8rh/kfDVhrVQJOTL V4f/oOH3wEtKUuWZxOxTJYipG62j6k6KsY8BMX5gkdTKC5VKcqkO1XxRjkkNHea3 LM1af9vpzaWtOVnPd4lHdteZju1+FA0BuJbIG5f34RpFEp2qZox30jrPopkNQ10m KWJ3y/mXBuM9MBHl81je1WgovL+YOKp7SZ9cPPtFadJZ/vtIJ0LRFKohfnh2rYU/ 9S6Vp93JNdZlELfoy6bBVOZD0Kg6gxZApZEqTXx4s7SMi7zHJc9jWmx2ZSAJkyyj tWhUmoylF6k/uJ4YAJkqVYpiEvuOoKQfH8TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523241878; bh=NKfE98pSi4 i0FPkiupnz+FO7OVsNfZ+j5BtzUUH+bmQ=; b=mKgXAIqhvRlmue6awMsTf1g4rS Ts+V2RZBvHnu1gSbgEMbrk6hEPaPOVeAovXIBRKcIC5N9mChJMYBMQ7HAoQ2hWqr NL2G/kfZd42Tn6RvrxEZQgncCigg+TKJNt/zGQjqqx1pJeoHEgSGc1fSDcuNiOco LOhCQfrwcE2mzm7ikvPdO+/csblHU75Q8jd3NgM4vlcD01Z8pksfn2Tve38lbxjC s0wPaBFx+yjwTl3TBeE+iNmOM9ReUwRuccwXEF6bZGZLv+pT/VHEsYdKeQcyVfMn /XMkku1NT1N1prqFv+b+DD3FoKSgVRsfD3yjsG1Jm/uRGXc7VcDJNDhjB/CQ== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=lQnGldLM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=lQnGldLM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfGGqSB2GF4DfOrMffb++W2f3PNUVjZlQ/KWn/ZkB+aMo7HfRAEXJ6h1Z5eqhemnPWJlBRu2ncLnO5DOdupz1DbM+lu9ihBfb9n54PDM1j9m952pYPepc jnv9RTWVIf35N+4f4L/eA+QDNz2IixFQhAJ5uqRLTtcA302Rbr9jhC2DIKvcTV+lkd+L5KC1bOKvs892o7Xti1pb9kvKRyZyTztvH6Fr1AV4dqeD+CcuR86T X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=sozttTNsAAAA:8 a=FNyBlpCuAAAA:8 a=yMhMjlubAAAA:8 a=NNeOVBY97NOYg26mT8oA:9 a=wPNLvfGTeEIA:10 a=aeg5Gbbo78KNqacMgKqU:22 a=RlW-AWeGUCXs_Nkyno-6:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755856AbeDICng (ORCPT ); Sun, 8 Apr 2018 22:43:36 -0400 Received: from mail-by2nam03on0126.outbound.protection.outlook.com ([104.47.42.126]:2432 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755456AbeDIA0w (ORCPT ); Sun, 8 Apr 2018 20:26:52 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Tero Kristo , Herbert Xu , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 026/293] crypto: omap-sham - fix closing of hash with separate finalize call Thread-Topic: [PATCH AUTOSEL for 4.9 026/293] crypto: omap-sham - fix closing of hash with separate finalize call Thread-Index: AQHTz5jwHNF0TLyyJ0qIfAUx/Jy8QA== Date: Mon, 9 Apr 2018 00:23:10 +0000 Message-ID: <20180409002239.163177-26-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0885;7:x3wgahrVB0ra+VQqysCGY+CmMEb95m0ld6ptfWJAUwoNKysz76gQxSzEuKu5/xcuQcdD+NRWvY6Y7xXsgpwM2z2K29OU/Dsd40+668TVZsPwdBJJPbopFSSNgJSDMupeBRLzpX86B3CxW3YsRVDwvdLHHkYgKeMf6SOZqtKT6FtaLLn0d4Bx8bZFWlJKJXlVDTZoRAmAqLpRI5PjQAQsZWoDpmrJiah1pkFeD0RO4vwJQ2NIAMOunXJiq16SFSU1;20:zuhg0716TuurbUrypm+ojo/7PY+gHVBSb1aDS/T9kMJ179nOB5HRVflx6yUUiCSqpUHq3Nhq6/cJsnfScHda6FaGbb2NinhaoHu3zq3Pu7GF1TP8RnqOD+RQckRAMmZr34UxiJetkwIGCD6fcxhTOY3fSEqY9Bu9P39PM8pDCHA= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 274f06d6-1d4d-44a0-3128-08d59db09312 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0885;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0885; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(2906002)(68736007)(22452003)(316002)(6512007)(5660300001)(6666003)(54906003)(110136005)(486006)(6486002)(102836004)(36756003)(14454004)(99286004)(86612001)(105586002)(72206003)(106356001)(2900100001)(1076002)(97736004)(10090500001)(3280700002)(5250100002)(6436002)(3660700001)(6116002)(575784001)(3846002)(305945005)(86362001)(59450400001)(66066001)(10290500003)(186003)(81166006)(8936002)(478600001)(476003)(25786009)(81156014)(8676002)(4326008)(7736002)(2501003)(107886003)(6506007)(2616005)(26005)(76176011)(446003)(53936002)(11346002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0885;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: w3GfjUUBnG07u5cqjbakcJMeWYmmtlISYnu8Sur0DAHPted7tNpHZ/0A+rC3KJ3zbgLqps/C+SQghdyGKIPtQz4hcZFIakwk9biZJNARzhmJG7mVj/yGd3lsnmvtozXX6H3AQS4TwHPxl6GawVfFkcunGVG0q5+gFoN9jftU3erDMKDOCpAPhAeaTv9PfOn0Ud+DBohMfVdw12IrOjiAdsFW8nrSlHNCfWkS2lCINOqmom5vsnVXLYl2onD+J3DatRRoF/wQqVque/YvxwWlY6cPnFQv4AyGZE5hcEpIMlyI8rq0Bht84YY+ss/OAj+hCcCQKJ309UunLR8j7xKXIsZni0ujDQF/j4ht3EREkfW3oNoBCHm7+1kFgD4vrIRAMenhhLHFMzsP6oJObrb+kIviNXqELSiIGM48U2XSeAE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 274f06d6-1d4d-44a0-3128-08d59db09312 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:23:10.4248 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Tero Kristo [ Upstream commit 898d86a565925f09de3d0b30cf3b47ec2e409680 ] Currently there is an interesting corner case failure with omap-sham driver, if the finalize call is done separately with no data, but all previous data has already been processed. In this case, it is not possible to close the hash with the hardware without providing any data, so we get incorrect results. Fix this by adjusting the size of data sent to the hardware crypto engine in case the non-final data size falls on the block size boundary, by reducing the amount of data sent by one full block. This makes it sure that we always have some data available for the finalize call and we can close the hash properly. Signed-off-by: Tero Kristo Reported-by: Aparna Balasubramanian Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/omap-sham.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index c65b49baf0c7..d8305ddf87d0 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -750,7 +750,10 @@ static int omap_sham_align_sgs(struct scatterlist *sg, if (final) new_len =3D DIV_ROUND_UP(new_len, bs) * bs; else - new_len =3D new_len / bs * bs; + new_len =3D (new_len - 1) / bs * bs; + + if (nbytes !=3D new_len) + list_ok =3D false; =20 while (nbytes > 0 && sg_tmp) { n++; @@ -846,6 +849,8 @@ static int omap_sham_prepare_request(struct ahash_reque= st *req, bool update) xmit_len =3D DIV_ROUND_UP(xmit_len, bs) * bs; else xmit_len =3D xmit_len / bs * bs; + } else if (!final) { + xmit_len -=3D bs; } =20 hash_later =3D rctx->total - xmit_len; @@ -1137,7 +1142,7 @@ retry: ctx =3D ahash_request_ctx(req); =20 err =3D omap_sham_prepare_request(req, ctx->op =3D=3D OP_UPDATE); - if (err) + if (err || !ctx->total) goto err1; =20 dev_dbg(dd->dev, "handling new req, op: %lu, nbytes: %d\n", --=20 2.15.1