From patchwork Tue Nov 5 14:00:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 178502 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp709514ocf; Tue, 5 Nov 2019 06:01:43 -0800 (PST) X-Google-Smtp-Source: APXvYqyeR4fNTLd2oP8EO7oqOLMdPaWTDdEZa2ChknpsTzOU8eRMZaQ6xj2V27RTcGdd6lYHzTUN X-Received: by 2002:a50:c408:: with SMTP id v8mr35685147edf.140.1572962502539; Tue, 05 Nov 2019 06:01:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572962502; cv=none; d=google.com; s=arc-20160816; b=pt2MWU0Rwt7u4WJnxn3AjkJEHt77gYSWGZBbNTRSi6efBP+WHa6LykUMXJyKggqUX/ O8rjJvklFFHIMRXdyC9Bhnvie2kKL8d+5TztoyjGuJzQZbfzn14uvkgUr/SdU2E26gnf v9dO3cYmo3c66uF7nX/ztBr/mY00B14j/9aE+xkkSkqfzZ9Eja8NbYgqyGQbj3QNO89J BjqwH0Wntii2v/TQ0OouwJcr2EcEAgVpj2gi0LnohG16h7VQwcmlL7lYrOPJbYJcv54S a5BRAsYjk4IAhCS4+cdfoKciTZH7iDPauoLSGBJCS+BabqblVDPPnKEimP/gFJcRyv4h cB9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=/548IYlsZzVpGFlUyLpuldMg6WhApejqtJF4qdDLFY8=; b=Kd/PmVQGUDPPvMFabbskw2eIpXbmIOA+4IcFneS+Rna/6oyLxGnuH8wr8foK+qJG7Z 5Ecvm0AcVNBAQYEqzuC24AemvEJUkc7ZO7h/Z/jz8CENPqOrLidNdRWzdTBjWzxvNmPP dd5G5Yj2owdlqIPz/jXxPjxeUsvH1KrRDdr/89csBnP1Hg2kPhooG96pza5Jc0Pr7z5F LfjZ7c6cdXsiYhsQS37tDREWyiq1D0Ee7cbeM2nMQKZqY6pGB6Yx79WW7Eyt6DU4aYCE zdpkK5nIjL7mz7lNtQpvIF/d919Xczwzi2+Os0ia1ubM+/qcuSUetWyTYVT8tjZv1muC XHuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=xnNecQu0; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dk11si13340421ejb.97.2019.11.05.06.01.42; Tue, 05 Nov 2019 06:01:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=xnNecQu0; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389369AbfKEOBl (ORCPT + 5 others); Tue, 5 Nov 2019 09:01:41 -0500 Received: from lelv0143.ext.ti.com ([198.47.23.248]:35128 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389290AbfKEOBl (ORCPT ); Tue, 5 Nov 2019 09:01:41 -0500 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id xA5E1aPm038169; Tue, 5 Nov 2019 08:01:36 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1572962496; bh=/548IYlsZzVpGFlUyLpuldMg6WhApejqtJF4qdDLFY8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=xnNecQu0ByEXRygUFD4eTHRu4VpwDaHeJSu2V1Cb3iI5G1S8tJeCIyF/Y/vPy0z8/ O9nJyYgVcxnBSOW2z3+EAG0edxyoegvy7P4E6cYt/awKIT1fQxX5f/weiOV5zM5AY2 ecP3Dt4H+BFUgPDDDCC5pVuN9zKFzwkRZBCXKNXI= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xA5E1aEB087706 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 5 Nov 2019 08:01:36 -0600 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 5 Nov 2019 08:01:36 -0600 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 08:01:36 -0600 Received: from sokoban.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id xA5E1FFk068289; Tue, 5 Nov 2019 08:01:34 -0600 From: Tero Kristo To: , , CC: , Subject: [PATCHv2 07/22] crypto: omap-aes-gcm: fix corner case with only auth data Date: Tue, 5 Nov 2019 16:00:56 +0200 Message-ID: <20191105140111.20285-8-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191105140111.20285-1-t-kristo@ti.com> References: <20191105140111.20285-1-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Fix a corner case where only authdata is generated, without any provided assocdata / cryptdata. Passing the empty scatterlists to OMAP AES core driver in this case would confuse it, failing to map DMAs. Signed-off-by: Tero Kristo --- drivers/crypto/omap-aes-gcm.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 2.17.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/crypto/omap-aes-gcm.c b/drivers/crypto/omap-aes-gcm.c index 9bbedbccfadf..dfd4d1cac421 100644 --- a/drivers/crypto/omap-aes-gcm.c +++ b/drivers/crypto/omap-aes-gcm.c @@ -148,12 +148,14 @@ static int omap_aes_gcm_copy_buffers(struct omap_aes_dev *dd, if (req->src == req->dst || dd->out_sg == sg_arr) flags |= OMAP_CRYPTO_FORCE_COPY; - ret = omap_crypto_align_sg(&dd->out_sg, cryptlen, - AES_BLOCK_SIZE, &dd->out_sgl, - flags, - FLAGS_OUT_DATA_ST_SHIFT, &dd->flags); - if (ret) - return ret; + if (cryptlen) { + ret = omap_crypto_align_sg(&dd->out_sg, cryptlen, + AES_BLOCK_SIZE, &dd->out_sgl, + flags, + FLAGS_OUT_DATA_ST_SHIFT, &dd->flags); + if (ret) + return ret; + } dd->in_sg_len = sg_nents_for_len(dd->in_sg, alen + clen); dd->out_sg_len = sg_nents_for_len(dd->out_sg, clen); @@ -287,8 +289,12 @@ static int omap_aes_gcm_handle_queue(struct omap_aes_dev *dd, return err; err = omap_aes_write_ctrl(dd); - if (!err) - err = omap_aes_crypt_dma_start(dd); + if (!err) { + if (dd->in_sg_len && dd->out_sg_len) + err = omap_aes_crypt_dma_start(dd); + else + omap_aes_gcm_dma_out_callback(dd); + } if (err) { omap_aes_gcm_finish_req(dd, err);