From patchwork Thu Nov 22 19:54:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151823 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1152206ljp; Thu, 22 Nov 2018 11:55:15 -0800 (PST) X-Google-Smtp-Source: AJdET5dazVNCBMIHEQVv4V6Egm+BOgOPt4lW3cyrrlZ6BJSB+YXwhR0lMHzuRVEBSVjCjuVH1Fs0 X-Received: by 2002:a62:d504:: with SMTP id d4mr12740358pfg.38.1542916515766; Thu, 22 Nov 2018 11:55:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916515; cv=none; d=google.com; s=arc-20160816; b=aqzVszIPypaeYJDBpI5tr2YC+6lelb14SnAXNQ3a5VVp5Xot8K14lOVaS0Oy7B95MZ ASmzRFstaSnUODIJGv0QM24SkYAOtfsp4t5Yf+GPP9z/J2RjVWrNb7GL5rOH2ENQnFrc TM5MyC1lufGvnafdkuu6wt3Esv9C0U8ENlwK44t7McGr635m/BhTSVcfZzi+d2wWd+pS h49NAPetC1u3omvqSRd0DFDPVmpQY+3ube6+HHSBvlot10pWhP0sWikdVtugAJy6OEC5 rO0POK+7MiTcDhZV1F8plkh9yYGEIimX59N3Aw5bjoYLHHFRzs0Y74f0d/twy1oodloB br4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=8DbEtrwcat6kzuIYJybpxV9zRQMBoGAqFPiiwJrGSkc=; b=Z9K2UlQtMBdEEO3gC3MBo9J9YKkxNTDNC0qDqZ6QT01fNbNL3Z/IF61AMzcWJSX+hn H3k1Dae0/8OeFEZylwIeLHc+hRurKFpIWaFJIjr7ECGsYUSafSNGqYCTsGtEJm/CJ//M xEz0uUjVtXJKPh95ZvJxO2b8eQp4TuP7vplOm1km1zbeTpcMi0Jovkbep8PTurebuf+U W8lkSYCMnd7QNzm30uYWtL0ur2IcB3cOlAPtXNc89IWJvyAgBevYBRejgh5FdMZPsPQY MZo7Rx3XA9qwwJfGKSQQpCearS8XvFI2PpxkOxhT73Qh2HpJJK4sUuehwmkwp+Oi0eOi ZFAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LvGvBgG8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l185si49222422pgd.253.2018.11.22.11.55.15; Thu, 22 Nov 2018 11:55:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=LvGvBgG8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407043AbeKWGgF (ORCPT + 32 others); Fri, 23 Nov 2018 01:36:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:35008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733189AbeKWGgE (ORCPT ); Fri, 23 Nov 2018 01:36:04 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BD18A20672; Thu, 22 Nov 2018 19:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916512; bh=9qd1Ftiv9e8SPIBQg6VCgYe4qsENaZtytXLajQXqohc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LvGvBgG85p64P3y515BEmWkIjRD10PBK37FaT7B20BDBafYMt7lyIrZPcZCRDEpcN 8PPKjzF1AgiwXXx5HxTCwMa4jfgfXD070MrfeuXu8shvZVA5ROxY/zeMo+lkgxQrGt 0SQuNNxTU9DGfmXyrorQ8MGS4istfIZOdOcfdhVI= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Herbert Xu , Sasha Levin , linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 06/21] crypto: simd - correctly take reqsize of wrapped skcipher into account Date: Thu, 22 Nov 2018 14:54:37 -0500 Message-Id: <20181122195452.13520-6-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122195452.13520-1-sashal@kernel.org> References: <20181122195452.13520-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit 508a1c4df085a547187eed346f1bfe5e381797f1 ] The simd wrapper's skcipher request context structure consists of a single subrequest whose size is taken from the subordinate skcipher. However, in simd_skcipher_init(), the reqsize that is retrieved is not from the subordinate skcipher but from the cryptd request structure, whose size is completely unrelated to the actual wrapped skcipher. Reported-by: Qian Cai Signed-off-by: Ard Biesheuvel Tested-by: Qian Cai Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/simd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/crypto/simd.c b/crypto/simd.c index 88203370a62f..894c62944106 100644 --- a/crypto/simd.c +++ b/crypto/simd.c @@ -126,8 +126,9 @@ static int simd_skcipher_init(struct crypto_skcipher *tfm) ctx->cryptd_tfm = cryptd_tfm; - reqsize = sizeof(struct skcipher_request); - reqsize += crypto_skcipher_reqsize(&cryptd_tfm->base); + reqsize = crypto_skcipher_reqsize(cryptd_skcipher_child(cryptd_tfm)); + reqsize = max(reqsize, crypto_skcipher_reqsize(&cryptd_tfm->base)); + reqsize += sizeof(struct skcipher_request); crypto_skcipher_set_reqsize(tfm, reqsize);