Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3008134ybt; Mon, 29 Jun 2020 12:46:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkO7Eri/l9HL6k0amd7iuDiEPFCfap0bjncpnuOSFApEjJL9LjgRG+9Urh5X9Z7O/vpVEk X-Received: by 2002:a50:e801:: with SMTP id e1mr18825091edn.251.1593459971713; Mon, 29 Jun 2020 12:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593459971; cv=none; d=google.com; s=arc-20160816; b=asLkoBqViFLNRzlt+r43bSa/Rs7Q8bpoGyb9pTs9kaf8kjMTNiBQ22toRCJHffkU7B dKSiwvn9bmgIo9RFAFWkduYGmtYFDPHGT3+/GgCILrVY3qUqFgVbK519mh9G5TbYksUH u8tL6wAKyN9hwVO3Uu8p9BocwuL8/sjCKZ+ftgoJFGF2vN2xP056cV3z7owiwVd5RK5u iAhZUEFuQZ1AEOrNw/y/zuO76DyRrdW0lUJz328XcmZh7fXTzWJat1Zxz4yqRDqDQ+cZ dCKRwDFsBlHys+XrCl5R0HQYpBmvovxyD9LgK1I68o0Wt7H2tdSkSL6lqoXqyh94ebbb EA9w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=pz2zVEbs1giIQ5zpDLkzeCZr8osPbq1Lq53hfSyhqkE=; b=cb48zPI4+FoaHhLCewr87DCDuQUnsODb09fSm/Da4x9N0GnfWKX6M3VftpIPH6Qa0n nqmmbnQ0Dne9pV/O04TTZ0Qw+Ve/06YDjifKHOT7FgV7Cvt5++hai/hsrLLZZvi6ZwZW j4UzHYCfM6Qan6y4v4cBvUKNcBaAOWC/XC7ZbH6zArBIDxO7Zqun5n8A/NKzaftI9+Gq 6UnXSS9XgarG8g/kJwMcrU8ftUuOAweHyCpQ2Oei8a9YaaSyfMuBVVa+Fu38+69E3UNC kCXGf8fv3RfHiGlbuTBrPPVOadyfvIg6AqBqu5QxPysuVLZLPbYuOZLZDVBcET4MMLkX 54Vg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l61si272265edl.512.2020.06.29.12.45.47; Mon, 29 Jun 2020 12:46:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731039AbgF2Tp2 (ORCPT + 99 others); Mon, 29 Jun 2020 15:45:28 -0400 Received: from mga07.intel.com ([134.134.136.100]:58002 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387829AbgF2Tko (ORCPT ); Mon, 29 Jun 2020 15:40:44 -0400 IronPort-SDR: sQDU65sbwKMJBaJpo/YD9eYziTFxBOHq2PDuGSyI7yEduEU/uuZE7VtQpw1c9rOU2Pvn3WYAR7 uVnwowGQg7UA== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="211091679" X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="211091679" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2020 10:16:38 -0700 IronPort-SDR: b/ia9QQ8Pdm0iF1UD0geaYywFkKql6uBzX01MsPwFdVFCJl7hCrEALpkfIvwS++wd9foS1ANhc jIKR8iSHfvvQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="264891342" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.222.51]) by fmsmga007.fm.intel.com with ESMTP; 29 Jun 2020 10:16:37 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, qat-linux@intel.com, Giovanni Cabiddu Subject: [PATCH v3 2/4] crypto: qat - validate xts key Date: Mon, 29 Jun 2020 18:16:18 +0100 Message-Id: <20200629171620.2989-3-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200629171620.2989-1-giovanni.cabiddu@intel.com> References: <20200629171620.2989-1-giovanni.cabiddu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Validate AES-XTS key using the function xts_verify_key() to prevent malformed keys. Signed-off-by: Giovanni Cabiddu --- drivers/crypto/qat/qat_common/qat_algs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c index 6bea6f868395..11f36eafda0c 100644 --- a/drivers/crypto/qat/qat_common/qat_algs.c +++ b/drivers/crypto/qat/qat_common/qat_algs.c @@ -995,6 +995,12 @@ static int qat_alg_skcipher_ctr_setkey(struct crypto_skcipher *tfm, static int qat_alg_skcipher_xts_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { + int ret; + + ret = xts_verify_key(tfm, key, keylen); + if (ret) + return ret; + return qat_alg_skcipher_setkey(tfm, key, keylen, ICP_QAT_HW_CIPHER_XTS_MODE); } -- 2.26.2