Received-SPF: pass (google.com: domain of linux-crypto+bounces-1007-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: ovidiu.panait@windriver.com
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, davem@davemloft.net, festevam@gmail.com
Subject: [PATCH v2 05/14] crypto: sahara - fix processing hash requests with req->nbytes < sg->length
Date: Sun, 24 Dec 2023 10:21:35 +0200
Message-Id: <20231224082144.3894863-6-ovidiu.panait@windriver.com>
In-Reply-To: <20231224082144.3894863-1-ovidiu.panait@windriver.com>
References: <20231224082144.3894863-1-ovidiu.panait@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?ZEd3YTg/B9aA8yjyHF1vOsFK4bMAD/T93Y3BthD7aUbQf3wpf6g6FEs9tfd8?=
 =?us-ascii?Q?VfXXhN7CAsEUJphmuYM7uaY7YyqqczhrtE8EdI46lSPWl81quznLUY2L4rCS?=
 =?us-ascii?Q?S/0Z757KijXxr/Rs1Byvf2rU+Iy7ujpyeps3mU0sIb4IW1a6fyMjBGJzjfBJ?=
 =?us-ascii?Q?s50GcKd7xxzVSbNXp1wjN2l0eauA2b/K4cMRc6YGK951G6ycgcq6SgcsC9+z?=
 =?us-ascii?Q?Spy5xyl7OWvr3Rahw1b+2AaKtyqRaHoqJAulBueT1WPQvYcNvSXdp0bdGs1b?=
 =?us-ascii?Q?f/stGG8C/stVkEDEhQCW4uH9tT7OOCKf67WN7zRP1YM8mnRu14NO7+b71xYJ?=
 =?us-ascii?Q?ypT/Yq6ARc/EMHp/D1Egq5TwTcLgViMqSGw5ooBVrrBmDRWX+VL4lTdaI9KV?=
 =?us-ascii?Q?E/0aXJXszL44lqcHeAc95djTXHKxRdnZsgmSG5TLe6kzCgiSXqcnlXmjCIBA?=
 =?us-ascii?Q?3+JocAGYV4Jm5biSPrKn5CWAHg688DAJ5nOPqWsdjbTxUQ/7D9VH19cTsJNV?=
 =?us-ascii?Q?IJCfDNLLWsa0R4B+LzaohxCP7rLk3Sg4zv64/Hh63t8kp5vZU1QQZLpkqrim?=
 =?us-ascii?Q?DvYnEgb0E1osV6tEkpDPfFGyaHDym6eIR9L4TZfXNJPQBOsSBW/ims0EiqHR?=
 =?us-ascii?Q?pKVJ6F40NSh5/uOPcyFEC8WfNY3iIu1Otq2WIHq7vrgT2xSeSHAaGf9cLR/o?=
 =?us-ascii?Q?UgMIgHzq+zLmiUEQllEhzASHw5WHYw2YMr9GfypwTOw4/IJMcwhnoidzJT1R?=
 =?us-ascii?Q?EOyA8YEtrVHH8kldxT9nIGm5gqadl+GwxQtDRazX2Uq3ckQHE5zMBqOGod5p?=
 =?us-ascii?Q?P82MkxYlYBuyL8aa2+hzkE4Ih9MzbFBopTLyFTRZJz9SCi8ViN5wKQsYVCcH?=
 =?us-ascii?Q?yNIFH5ay4WRDJlwfDla36t8s4FVMlqbixr/r1O3BIaPvxnimf/37c+DkIcXO?=
 =?us-ascii?Q?kVRmBUDHTASNzxdIbLImIdfHngUIq/lQc0p4BF4bB8dX1/5IRt1LRTjAYPXR?=
 =?us-ascii?Q?3wI5nMVIYsJ+eGY3OSFs1Bi3kZjfPHwJAmikkc9iU3OGy0OT5f0p6oRYFXzZ?=
 =?us-ascii?Q?6lAi8HvJ0LgVlaoVipbBNqHlIKQqIFHenl0iPlnIAX5MFWW8T1NlyVBkfGpV?=
 =?us-ascii?Q?nDp3/AkO8BMI1Avc5yNKyq4MiwYyjK9MY1GAyJ9olU34bm755l/u9kUSLX3x?=
 =?us-ascii?Q?uKNn4RB8pJFZn2uq60pOR0aYilALSS/9oSC5rKnOSOqYJsqnNk8QqLWhSxAB?=
 =?us-ascii?Q?WZ0pV1zNH7S4kwHig1iGAyAplJmgJ2bgyP1uqaRk+GJgF2iATSpvwvqfn8SY?=
 =?us-ascii?Q?WbVF1lAw7Lr1HjZbk0ztkSRgBdzJQVLmopQQETgqGQzrqNUbOOMxE/KucGME?=
 =?us-ascii?Q?IBWWmSQXAiORVMfluyvvRbnh7bwSSXv5+a6RACsrIZIA08aCE9Ky7wsfPDZH?=
 =?us-ascii?Q?gMxD6HBQDsp+oxuRbXEvlxCz0OjlrCy8xf3XZ+Kd1zA7j59AGBUDgUrdT5Pf?=
 =?us-ascii?Q?7/CFEqInQf4oSBv2uOBUMxd9M/mw3QoD38yiJJnfXbEpNy4kBcAP3ffX7Wy3?=
 =?us-ascii?Q?Hi0wInOibww3cm9fuk4OQsm4uIlxpH5SaVbiPMJYgi627QcOQVcnAUmvhjdI?=
 =?us-ascii?Q?CA=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1b6187af-c075-430a-330f-08dc04594731
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2023 08:21:07.4213
 (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: mq+ed4QMsca6v3B+qCCP2jEujYGfQd+RWjaR2gIP6F+VMJcRzHWNQFg78YBOVBo10G6B6t6iWnqKhHBNtwTGgvpqaKNCY+71squon3X6aAE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4693
X-Proofpoint-GUID: byZQmAb84IuqYwKb62KhYVvmSa0lZiqU
X-Proofpoint-ORIG-GUID: byZQmAb84IuqYwKb62KhYVvmSa0lZiqU
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 mlxlogscore=920
 priorityscore=1501 mlxscore=0 bulkscore=0 impostorscore=0 adultscore=0
 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0
 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.19.0-2311290000 definitions=main-2312240066

From: Ovidiu Panait <ovidiu.panait@windriver.com>

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 <ovidiu.panait@windriver.com>
---
 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 d49659db6a48..321c11050457 100644
--- a/drivers/crypto/sahara.c
+++ b/drivers/crypto/sahara.c
@@ -774,6 +774,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;
 
@@ -795,12 +796,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.34.1