Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp879939pxk; Mon, 31 Aug 2020 04:00:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytPDOAJzJD8aT9/DBNKTJXdwss2BDQvGIjVqhXeb9Vk0/ms0HPOvsHKK+X4Zpr0dxIDWXG X-Received: by 2002:a17:906:3816:: with SMTP id v22mr570030ejc.105.1598871648358; Mon, 31 Aug 2020 04:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598871648; cv=none; d=google.com; s=arc-20160816; b=zyJmxNHpdZrWnVKyVnHng3ib4ibJG0T7Xk9lyIf7lMrJt0ULdYakKCkVTH0Bm0Z4n3 YnDSdD+7gkS9E/eVhIDIgUdCuLYpUH6VWZ3IWx088GaHYehi1BnLxhTiqEKsH1YlCvfJ Qvl7wbvwYb9sc4oAli14JzxS4X00rCbYStvLUDVaAg8xZK8a7YkfjbBqoDida92g+MkH Njvrn58mABCLg6Uje8asSgvnveq1gGtIb97Jlq6BcsZ6XIDRd8eDfiNOK5ua3kf5jYYa rq2iba/4FnI2e7r9mw50nEotUz7bYlxMSv9dz5UOVZIrivKcRfsP05dp7R+PkTdEd5u4 5Riw== 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 :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=lOJEkTioOzypaT4jphYoa/PYROkUN0kr8iu3lt/Oq6U=; b=zBLeuAq36LC6vQ70KGi1Ajlfsw1ClY+aSr8s9aJO+k6Dja/ei0yfBM8wEL2LW+gMSk TMNkOWcFS5hU4gnHxDegYlueyxid0rsv86d8ifkMWrCXNjhBQ1EY/ijhpmmI0+n+4P4H Er6YvSrZ33FExjsgAFw1UEboB5aQ+PaQ3ObwTChpDkiWboxi1gsYs7hcnbmBtRB2XKLf uMbhLl3VR9px6fACLR8LVcrYNVOU91vkaxIC1xdHd78XYZbWWjbDQBQN4o+HPL4JAECA L3mgbqiN8ih4YHWRblmoMjO8oEmf3iLAnAYP1HlDz4NBAc1fRpFgKMw+eRzrXgFV1VfN 6h7g== 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 l6si780061ejg.212.2020.08.31.04.00.23; Mon, 31 Aug 2020 04:00:48 -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 S1726042AbgHaLAR (ORCPT + 99 others); Mon, 31 Aug 2020 07:00:17 -0400 Received: from mga09.intel.com ([134.134.136.24]:18006 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726224AbgHaLAP (ORCPT ); Mon, 31 Aug 2020 07:00:15 -0400 IronPort-SDR: KdhkDEHcgKtYwmt3t/07sAxeckfRDiRageVFisNFIJ/kFEhQdKaZ9a+7BwxqGjm36+Gxt1y2ZV Om41LWOvU6Jg== X-IronPort-AV: E=McAfee;i="6000,8403,9729"; a="157955515" X-IronPort-AV: E=Sophos;i="5.76,375,1592895600"; d="scan'208";a="157955515" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2020 04:00:13 -0700 IronPort-SDR: +HwZLV74qXcrPgeV6UDegDL2kcPyYoHLnxU/A1eUahZ6GJRhutM0FoajlobHwHuIbHn9F2qzcw jLuxbZJHPh2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,375,1592895600"; d="scan'208";a="314313068" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.222.51]) by orsmga002.jf.intel.com with ESMTP; 31 Aug 2020 04:00:11 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, qat-linux@intel.com, Dominik Przychodni , Giovanni Cabiddu Subject: [PATCH v2] crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA Date: Mon, 31 Aug 2020 11:59:59 +0100 Message-Id: <20200831105959.107261-1-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.26.2 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 From: Dominik Przychodni Return -EINVAL for authenc(hmac(sha1),cbc(aes)), authenc(hmac(sha256),cbc(aes)) and authenc(hmac(sha512),cbc(aes)) if the cipher length is not multiple of the AES block. This is to prevent an undefined device behaviour. Fixes: d370cec32194 ("crypto: qat - Intel(R) QAT crypto interface") Signed-off-by: Dominik Przychodni [giovanni.cabiddu@intel.com: reworded commit message] Signed-off-by: Giovanni Cabiddu --- drivers/crypto/qat/qat_common/qat_algs.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c index 72753b84dc95..d552dbcfe0a0 100644 --- a/drivers/crypto/qat/qat_common/qat_algs.c +++ b/drivers/crypto/qat/qat_common/qat_algs.c @@ -828,6 +828,11 @@ static int qat_alg_aead_dec(struct aead_request *areq) struct icp_qat_fw_la_bulk_req *msg; int digst_size = crypto_aead_authsize(aead_tfm); int ret, ctr = 0; + u32 cipher_len; + + cipher_len = areq->cryptlen - digst_size; + if (cipher_len % AES_BLOCK_SIZE != 0) + return -EINVAL; ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req); if (unlikely(ret)) @@ -842,7 +847,7 @@ static int qat_alg_aead_dec(struct aead_request *areq) qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp; qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp; cipher_param = (void *)&qat_req->req.serv_specif_rqpars; - cipher_param->cipher_length = areq->cryptlen - digst_size; + cipher_param->cipher_length = cipher_len; cipher_param->cipher_offset = areq->assoclen; memcpy(cipher_param->u.cipher_IV_array, areq->iv, AES_BLOCK_SIZE); auth_param = (void *)((u8 *)cipher_param + sizeof(*cipher_param)); @@ -871,6 +876,9 @@ static int qat_alg_aead_enc(struct aead_request *areq) u8 *iv = areq->iv; int ret, ctr = 0; + if (areq->cryptlen % AES_BLOCK_SIZE != 0) + return -EINVAL; + ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req); if (unlikely(ret)) return ret; -- 2.26.2