From patchwork Mon Jul 12 06:04:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472882 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2650897jao; Sun, 11 Jul 2021 23:34:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytR5waduAJYk69qRBnAypbC2hXab+QjlkbmtwXCJ21uuDYPmFzoZrlbiPfDBcmxZfY9fK6 X-Received: by 2002:a17:906:4d08:: with SMTP id r8mr18150328eju.464.1626071669079; Sun, 11 Jul 2021 23:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071669; cv=none; d=google.com; s=arc-20160816; b=CZyomXreMxNaaCkYvO9BmFFrEIFigcGlsm5Qjw/xCAz+Z5VnGsE0ZrcwSg1KcL8UmL u9uxOPBtTh3d4hCWr4zLJUxalK3dcTuzYvdcaZcgl/+dRoCjyhGI8UCOAO4W/b8XHA7P 5yinCNLU2IEUiJLsxlA3SnwdPgTMXwtGW8jTva/HB2aM7UYNoUA8HgLbQR1s0MQdVxXO 8idcF+1XJabPUD8XY1rqJ962L42Y3gv/Q7lZvOJtrJSWLRMgWLftRKcpcESowBaYwKqa ajvIHZ9PDzOx4NtyYBdJuyAOWb70d5o2L8quLV0//cYqkyEo+ow4w1GeUPMIN/pW9csg H2zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W9vJ0SMZiCskZnQ5TJR01HGuV593Tbhvi3ZGY6NouR8=; b=QGDk1XuUVBqehXPxrkT+VemmGWoP0N8ghyK5j42zY8aZ9lYLRYvzH2g2BSuh1oul0J spEU/MrAwP7aGUjS9aZSfhxnO3QMwgoVouxECiyvNG/GBEyOssDqHKcUMqt/1+Ln6nAQ /OddgilfncYT3aDqig+Fj0IbeeNigzMPX/igm0msNh3YIVGZHieX5kENLcVezG8X2xak r4ECQRUZ3SHqG7hmVas6v/o5b00ZT4racDdrR/UnWw+wauWi2TU3VVSpmCh+2DSHvU7Y tI9xUPTrLGC/J3Ep2cvifiaNcj51DMD740jMAkdsL6wc74EBcqn19TW/wTHOMat/t1KQ s25A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v5ECzWjq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d10si15581177ejl.552.2021.07.11.23.34.28; Sun, 11 Jul 2021 23:34:29 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v5ECzWjq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236253AbhGLGhN (ORCPT + 12 others); Mon, 12 Jul 2021 02:37:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:53518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235969AbhGLGfo (ORCPT ); Mon, 12 Jul 2021 02:35:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E82B6101E; Mon, 12 Jul 2021 06:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071577; bh=6qvfVHz8Ivbu+S8FtkH8bJH6LL/dj1fkRbuXihqrtqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v5ECzWjq600kR8a2fadVWyPKNhCr5wdfL3Ink/DUbtxq36udEQJ+0f/PiJzS6tH+n PlATGUpPxMUSUoBWWGM/M/RxovIRoEmlqttzxBMXdX3zdbcsutjBWBKjrfMzHojAj7 sJYqQ6iurN1gkY5I7ljPXsoK+V+LSwJvQKIx420A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thara Gopinath , Herbert Xu , Sasha Levin Subject: [PATCH 5.10 129/593] crypto: qce: skcipher: Fix incorrect sg count for dma transfers Date: Mon, 12 Jul 2021 08:04:49 +0200 Message-Id: <20210712060857.335221127@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thara Gopinath [ Upstream commit 1339a7c3ba05137a2d2fe75f602311bbfc6fab33 ] Use the sg count returned by dma_map_sg to call into dmaengine_prep_slave_sg rather than using the original sg count. dma_map_sg can merge consecutive sglist entries, thus making the original sg count wrong. This is a fix for memory coruption issues observed while testing encryption/decryption of large messages using libkcapi framework. Patch has been tested further by running full suite of tcrypt.ko tests including fuzz tests. Signed-off-by: Thara Gopinath Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/qce/skcipher.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index a2d3da0ad95f..5a6559131eac 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -71,7 +71,7 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req) struct scatterlist *sg; bool diff_dst; gfp_t gfp; - int ret; + int dst_nents, src_nents, ret; rctx->iv = req->iv; rctx->ivsize = crypto_skcipher_ivsize(skcipher); @@ -122,21 +122,22 @@ qce_skcipher_async_req_handle(struct crypto_async_request *async_req) sg_mark_end(sg); rctx->dst_sg = rctx->dst_tbl.sgl; - ret = dma_map_sg(qce->dev, rctx->dst_sg, rctx->dst_nents, dir_dst); - if (ret < 0) + dst_nents = dma_map_sg(qce->dev, rctx->dst_sg, rctx->dst_nents, dir_dst); + if (dst_nents < 0) goto error_free; if (diff_dst) { - ret = dma_map_sg(qce->dev, req->src, rctx->src_nents, dir_src); - if (ret < 0) + src_nents = dma_map_sg(qce->dev, req->src, rctx->src_nents, dir_src); + if (src_nents < 0) goto error_unmap_dst; rctx->src_sg = req->src; } else { rctx->src_sg = rctx->dst_sg; + src_nents = dst_nents - 1; } - ret = qce_dma_prep_sgs(&qce->dma, rctx->src_sg, rctx->src_nents, - rctx->dst_sg, rctx->dst_nents, + ret = qce_dma_prep_sgs(&qce->dma, rctx->src_sg, src_nents, + rctx->dst_sg, dst_nents, qce_skcipher_done, async_req); if (ret) goto error_unmap_src;