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 7E93F12BF2C; Tue, 23 Jan 2024 00:15:09 +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=1705968909; cv=none; b=qDOVdaDCP+GYCKSUZBibgZXok9tGXhzJNk9AiXOli176bzT0vnzJPmpdgHvMpTL/L9yQEeHsebK0jzZQFE4ldN5d7nxU7B9YbqIQNNroNr+ZM6cXO527SB2yeFME3rP0Y4ExkZiTWL48d5QrRTw0H2LfE2d4C5fOBX3Ds4oLihs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705968909; c=relaxed/simple; bh=DCaO4vbsfI9f6hYnz4m7mNrl6k0197bFDXUlp1wabUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R+zAbaTim02l99moC837xjIukLtoMJxnqZelJ6jzq6WmNSeBdoVXY3b2BlWWPbP637VkCinNU/tvideCJRd5vDTNZ3dmsAtncKDNiD7kOD9iue6cuLSy2UBKp05icPcqxkwcqTcn5B2ld7LkeZcXhCydkG18dF+3ivECA26IrGY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XLfwsq1L; 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="XLfwsq1L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E29A0C43390; Tue, 23 Jan 2024 00:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705968909; bh=DCaO4vbsfI9f6hYnz4m7mNrl6k0197bFDXUlp1wabUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XLfwsq1LbneIGFjlZME+fUmQqQPVsqVbLbzmu5xl9X5mYLbft3nIhHUaS5M4s3kp2 c0B6rdcXISeJjFToLrP1QZQHPZQd2nPZinOEpUqE8jA7/7bmQsYQFDbLItOtTX4/J6 xciJ4dFUKkh70tGwmjGtgd4lfaXVu1W7MOcRncys= 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 5.4 067/194] crypto: sahara - fix processing requests with cryptlen < sg->length Date: Mon, 22 Jan 2024 15:56:37 -0800 Message-ID: <20240122235722.086603706@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235719.206965081@linuxfoundation.org> References: <20240122235719.206965081@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 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ovidiu Panait [ Upstream commit 5b8668ce3452827d27f8c34ff6ba080a8f983ed0 ] 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 Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- 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 b48f92c8cd0f..c62f9ce6adc0 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -442,6 +442,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); @@ -492,12 +493,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); } @@ -506,12 +509,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); } -- 2.43.0