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;
Subject: Re: [PATCH 3/3] crypto: ccp - protect RSA implementation from too
 large input data
To:     "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>
Cc:     David Howells <dhowells@redhat.com>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        keyrings@vger.kernel.org, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <4af6c02f-db3f-3d82-9685-367913c684ff@maciej.szmigiero.name>
From:   Gary R Hook <gary.hook@amd.com>
Message-ID: <49db7800-b052-79e8-8d8d-24ddc6382e48@amd.com>
Date:   Wed, 28 Feb 2018 18:35:07 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <4af6c02f-db3f-3d82-9685-367913c684ff@maciej.szmigiero.name>
Content-Type: text/plain; charset=iso-8859-2; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Received-SPF: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2018 00:35:10.5823 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: bc08457c-9ca4-40ca-f80b-08d57f0c4ab7
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0693
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 02/24/2018 10:03 AM, Maciej S. Szmigiero wrote:
> CCP RSA implementation uses a hardware input buffer which size depends only
> on the current RSA key length. Key modulus and a message to be processed
> is then copied to this buffer based on their own lengths.
> 
> Since the price for providing too long input data is a buffer overflow and
> there already has been a case when this has happened let's better reject
> such oversized input data and log an error message in this case so we know
> what is going on.
> 
> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
> ---
>   drivers/crypto/ccp/ccp-ops.c | 24 ++++++++++++++++++++----
>   1 file changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
> index 406b95329b3d..517aeee30abf 100644
> --- a/drivers/crypto/ccp/ccp-ops.c
> +++ b/drivers/crypto/ccp/ccp-ops.c
> @@ -1770,10 +1770,6 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
>   	if (!rsa->exp || !rsa->mod || !rsa->src || !rsa->dst)
>   		return -EINVAL;
>   
> -	memset(&op, 0, sizeof(op));
> -	op.cmd_q = cmd_q;
> -	op.jobid = CCP_NEW_JOBID(cmd_q->ccp);
> -
>   	/* The RSA modulus must precede the message being acted upon, so
>   	 * it must be copied to a DMA area where the message and the
>   	 * modulus can be concatenated.  Therefore the input buffer
> @@ -1785,6 +1781,26 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
>   	o_len = 32 * ((rsa->key_size + 255) / 256);
>   	i_len = o_len * 2;
>   
> +	if (rsa->mod_len > o_len) {
> +		dev_err(cmd_q->ccp->dev,
> +			"RSA modulus of %u bytes too large for key size of %u bits\n",
> +			(unsigned int)rsa->mod_len,
> +			(unsigned int)rsa->key_size);
> +		return -EINVAL;
> +	}
> +
> +	if (rsa->src_len > o_len) {
> +		dev_err(cmd_q->ccp->dev,
> +			"RSA data of %u bytes too large for key size of %u bits\n",
> +			(unsigned int)rsa->src_len,
> +			(unsigned int)rsa->key_size);
> +		return -EINVAL;
> +	}

We've talked about this, and we believe that a more central fix is 
warranted. I intend to post another patch tomorrow that should address
this problem.

> +
> +	memset(&op, 0, sizeof(op));
> +	op.cmd_q = cmd_q;
> +	op.jobid = CCP_NEW_JOBID(cmd_q->ccp);
> +
>   	sb_count = 0;
>   	if (cmd_q->ccp->vdata->version < CCP_VERSION(5, 0)) {
>   		/* sb_count is the number of storage block slots required
>