From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EF23149010; Tue, 23 Jan 2024 00:20:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969205; cv=none; b=blVuYOXp2Wu9VVUdxsdfxUv0+Gs/uhQqcm8DvaK+rrgsv4U/wecPWeO3UbDjbWj1wTr5I6rlOLJ3opHTaxlf4eSjffVBmeyraVHhjlvUc4dmSqfIaw86Zl9l1KULjMHquEkM2pt76Ovyfmdexc5jK2vUdxMtNx98wDdNsjBaxh0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969205; c=relaxed/simple; bh=gu1ePTZoDB2psYG3n5DNT78krbvJRfw2s/1Sqsz2vqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jxb44AU2WFuM35FeEQ12mf/+kNsJC29oh74TUazXJ0LG61OJgVr8Ct5DXEVeR/TZ4Hi4WwxR4nYrFnvq8XIipISM6vi3O0WTaL4b3wEKP7oCBntOEz3htBl7CBnTDb1X+lhgbY/NJzVznS5bfmcfmtz7hzJP4jmHN/x4gWDDoH4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tSuOp+qW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tSuOp+qW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 099A0C433C7; Tue, 23 Jan 2024 00:20:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969205; bh=gu1ePTZoDB2psYG3n5DNT78krbvJRfw2s/1Sqsz2vqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tSuOp+qWKn6cnqu23LJKQO6V0RuTbRhVTFT8qQWOx8nXCSNFY1NIzMRLP+UtospTm 1Z2NvrsaIsisCKMNjz/fUyRW2+JOKtjNUPtPmrSZh7aNUJpxaiTIOwv/QbtEFxiEbs BJqpgeL842MSk2XdVVkVkJ/BLxdYt203wTTfEGEo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ovidiu Panait , Herbert Xu , Sasha Levin Subject: [PATCH 6.7 080/641] crypto: sahara - fix processing hash requests with req->nbytes < sg->length Date: Mon, 22 Jan 2024 15:49:44 -0800 Message-ID: <20240122235820.534033755@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235818.091081209@linuxfoundation.org> References: <20240122235818.091081209@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ovidiu Panait [ Upstream commit 7bafa74d1ba35dcc173e1ce915e983d65905f77e ] It's not always the case that the entire sg entry needs to be processed. Currently, when nbytes is less than sg->length, "Descriptor length" errors are encountered. To fix this, take the actual request size into account when populating the hw links. Fixes: 5a2bb93f5992 ("crypto: sahara - add support for SHA1/256") Signed-off-by: Ovidiu Panait Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/sahara.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index cfb02905c1ab..dd8291a4442c 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -776,6 +776,7 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev, int start) { struct scatterlist *sg; + unsigned int len; unsigned int i; int ret; @@ -797,12 +798,14 @@ static int sahara_sha_hw_links_create(struct sahara_dev *dev, if (!ret) return -EFAULT; + len = rctx->total; for (i = start; i < dev->nb_in_sg + start; 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 + start - 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); } -- 2.43.0