From patchwork Mon Jul 29 19:20:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 170026 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1657651ile; Mon, 29 Jul 2019 12:32:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqz1UvJrNLC6MiTLudtaRY+CCjhi6nu/uZx10vGj7Zp0f4L/jEI0lmfhBbja12tIi/mzDOLL X-Received: by 2002:a17:90a:2768:: with SMTP id o95mr113210097pje.37.1564428726973; Mon, 29 Jul 2019 12:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564428726; cv=none; d=google.com; s=arc-20160816; b=Fuml6YNsymm2v44/nDCIZ3IFekBoJlWKjfuhXGWFfwfJs972KrFLUqb4QbXV2IFZi8 wd8CKwFHbz8hRNcFNfRiQQ9Hlw8xcusKG2hZBkVu1B8RnmvD2WTYeQGLwF/izr8HGD45 s5Dit3FeFjvLufFlHYcs4vzevcW52K0Ktg1UZt4gWx3Fawx1VaL9dgSTEIeNUnHkayqo JFz9nz5AaU+meWBDFiN1MAvnZTVvbW0In7N3t+Twzzsl5cALb6K9N+cvejy4WdLmcPYJ ElXD2jcNxnibUGPIwQh5YZONDooMeaTroJ4hXhSK61a/m6N2mKFwfKFalyKV6ExMa803 dySw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P+D5nNalZeTAxvDtcMP9jOtvYKm2tGPYdvunbH+tRj4=; b=aU8yASBNQ+FtsMIe74sw/MAPyuqZRoSJuczoKzCV30NJWlHSXusBKjeNGZLFIrJZ1V bGOYOB95ekCNcEg1u5Z2vXpOIurp8GVBC1VockFWRw6RsX07gcBrNH1duC9GUiv9uRgD YsgAjUgeCqZZvqEkeU9xUvIm4RiLL2l5kdxtBu4NgxEp4KKOEWXS4pvSRkNRhnKBzTBI 5mKWmYE4Mxqm0HIq7qKRAgwu3Mx2Z74ZM7/SmaV7dWls6L46FP65elWCHEXG9kwYy1mV lGIG/zOJ3BclZbvbQItjVhKGYW//M/EM51G6ZDoDWVnM5RcIZauQ79fF0YIY67nimPf6 2hjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qaHypbMm; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h36si26495272plb.199.2019.07.29.12.32.06; Mon, 29 Jul 2019 12:32:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@kernel.org header.s=default header.b=qaHypbMm; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729383AbfG2TcF (ORCPT + 14 others); Mon, 29 Jul 2019 15:32:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:45232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729389AbfG2TcE (ORCPT ); Mon, 29 Jul 2019 15:32:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AE022070B; Mon, 29 Jul 2019 19:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564428723; bh=/mMcL1qO+DoVheTOpWO+mEUa2orPdN6aPdPc7je13yA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qaHypbMm6/DkMSXM6PA+h/fv59H8bmXbVoq0B96N8+N69FMoN3Q6jsscaKB2oL9R3 +IyxmeT+dgkrnj2S4eD2Hd9MuhchQ5vjztutLvKfaw+cQcQZoY2lXGJ8zSRoZDuNfw QXZ293WAg8qb0m3Gdrf/3KKrNUOJZP+qihJEZ8LM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Horia Geanta , Iuliana Prodan , Sascha Hauer , Ard Biesheuvel , Herbert Xu Subject: [PATCH 4.14 166/293] crypto: caam - limit output IV to CBC to work around CTR mode DMA issue Date: Mon, 29 Jul 2019 21:20:57 +0200 Message-Id: <20190729190837.249555862@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190820.321094988@linuxfoundation.org> References: <20190729190820.321094988@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ard Biesheuvel commit ed527b13d800dd515a9e6c582f0a73eca65b2e1b upstream. The CAAM driver currently violates an undocumented and slightly controversial requirement imposed by the crypto stack that a buffer referred to by the request structure via its virtual address may not be modified while any scatterlists passed via the same request structure are mapped for inbound DMA. This may result in errors like alg: aead: decryption failed on test 1 for gcm_base(ctr-aes-caam,ghash-generic): ret=74 alg: aead: Failed to load transform for gcm(aes): -2 on non-cache coherent systems, due to the fact that the GCM driver passes an IV buffer by virtual address which shares a cacheline with the auth_tag buffer passed via a scatterlist, resulting in corruption of the auth_tag when the IV is updated while the DMA mapping is live. Since the IV that is returned to the caller is only valid for CBC mode, and given that the in-kernel users of CBC (such as CTS) don't trigger the same issue as the GCM driver, let's just disable the output IV generation for all modes except CBC for the time being. Fixes: 854b06f76879 ("crypto: caam - properly set IV after {en,de}crypt") Cc: Horia Geanta Cc: Iuliana Prodan Reported-by: Sascha Hauer Cc: Signed-off-by: Ard Biesheuvel Reviewed-by: Horia Geanta Signed-off-by: Herbert Xu [ Horia: backported to 4.14, 4.19 ] Signed-off-by: Horia Geantă Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/caam/caamalg.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -853,6 +853,7 @@ static void ablkcipher_encrypt_done(stru struct ablkcipher_request *req = context; struct ablkcipher_edesc *edesc; struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req); + struct caam_ctx *ctx = crypto_ablkcipher_ctx(ablkcipher); int ivsize = crypto_ablkcipher_ivsize(ablkcipher); #ifdef DEBUG @@ -877,10 +878,11 @@ static void ablkcipher_encrypt_done(stru /* * The crypto API expects us to set the IV (req->info) to the last - * ciphertext block. This is used e.g. by the CTS mode. + * ciphertext block when running in CBC mode. */ - scatterwalk_map_and_copy(req->info, req->dst, req->nbytes - ivsize, - ivsize, 0); + if ((ctx->cdata.algtype & OP_ALG_AAI_MASK) == OP_ALG_AAI_CBC) + scatterwalk_map_and_copy(req->info, req->dst, req->nbytes - + ivsize, ivsize, 0); /* In case initial IV was generated, copy it in GIVCIPHER request */ if (edesc->iv_dir == DMA_FROM_DEVICE) { @@ -1609,10 +1611,11 @@ static int ablkcipher_decrypt(struct abl /* * The crypto API expects us to set the IV (req->info) to the last - * ciphertext block. + * ciphertext block when running in CBC mode. */ - scatterwalk_map_and_copy(req->info, req->src, req->nbytes - ivsize, - ivsize, 0); + if ((ctx->cdata.algtype & OP_ALG_AAI_MASK) == OP_ALG_AAI_CBC) + scatterwalk_map_and_copy(req->info, req->src, req->nbytes - + ivsize, ivsize, 0); /* Create and submit job descriptor*/ init_ablkcipher_job(ctx->sh_desc_dec, ctx->sh_desc_dec_dma, edesc, req);