Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3013223rwb; Mon, 15 Aug 2022 16:08:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR6wKWYSxrittx2DpiopgsDnf7vEy0AYL1L/JtNGN9oX+xv0EdFx3EDljW9glf6QPNxrpQuu X-Received: by 2002:a05:6402:35c3:b0:43d:f5d9:b65d with SMTP id z3-20020a05640235c300b0043df5d9b65dmr16821788edc.149.1660604936608; Mon, 15 Aug 2022 16:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660604936; cv=none; d=google.com; s=arc-20160816; b=WXHA8BuAPbN2wBnHQhQ40OOux4DcEviLhj8hoiZSk7U1B6noysm45DqxWjQaMcQR+Q PNkkpFtvFKRvpZJTJZp36L/0tLnvM96aHfZcxwjt3gGo3/TW/73if8klW2x6atmJS/T2 Mnz1A10VJZZ8T3FNXSbfBAe01GD7Y44OrflvzbMolDs5EHoPZGfLL7d1X4K2I2zqJmel BSh/n9dbYPBRyOLGmJ9+AybhG1xXfhQrCortY1wswshz+8DeRNlIuyZIOaSjQsR9aMeg x+/FPlyqJRtMgScN/7e/x//cVNDFWaTv5d9bszrUYgs739r/jljLt5vsLt4Df6QJMY3l Q1VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TT0z2IZ1VpYpnWcyGqrKjc4EuRZXTxKrFpOB6lthjaw=; b=hn786nOn9M20TZZN9ont7cqcw2NTpy6LZWGAMQgTDMow/JmJPcl8diRO7hZ1PQ1APy sqdIFrTEe+4As95Su/BgkybFmP7hHBagbWsDH4S41NPDu4czou5480NBjQvJYZPaJ8n8 azXySHbDH/yrbzdqAes1hIoLyrBW6Of8KXxrs6PwzHpOXg2g9hmAbcPaWSpcVREnMG9E +X8R8vausMmrL4xEmvqDHT0o9wQOFcc92EvatyTzSF17JXGvL+3vTXNrluus2/8EfMV4 8j/p0tZ0AlWDUft+nhCz2KJL+92Es2OIDYdy3G1udCTUM4Fxf/VT8d12MNG7tcknhBDW uTCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xlWPHk4i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p37-20020a056402502500b0043c1908e995si8695341eda.113.2022.08.15.16.08.31; Mon, 15 Aug 2022 16:08:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xlWPHk4i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232658AbiHOWCc (ORCPT + 99 others); Mon, 15 Aug 2022 18:02:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347278AbiHOWA0 (ORCPT ); Mon, 15 Aug 2022 18:00:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BAB5BD8; Mon, 15 Aug 2022 12:35:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 31829611A1; Mon, 15 Aug 2022 19:35:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39AFCC433D6; Mon, 15 Aug 2022 19:35:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660592116; bh=oaG8uRFFATYpJIIbw+3NNlxAQIMb14Wg6pkWXbXB2uw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xlWPHk4iEBy+uMWpYjHAFSDuRBVcafsUhUgL4OwBenKZOsc2Nqhvj2ckZCwd9H9BN 6O1CZRCKTV23P8cJ3JyGHDsBcd5smSOer2tMiIJDD9AlBEC7MS5RVm3dgvNfPPUUnu xNaw9V6bj0a/EnSQTiSRdQNqy69VF84YXc+kG4h4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Nguyen , David Rientjes , Peter Gonda , John Allen , Herbert Xu Subject: [PATCH 5.19 0061/1157] crypto: ccp - Use kzalloc for sev ioctl interfaces to prevent kernel memory leak Date: Mon, 15 Aug 2022 19:50:17 +0200 Message-Id: <20220815180441.951140835@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Allen commit 13dc15a3f5fd7f884e4bfa8c011a0ae868df12ae upstream. For some sev ioctl interfaces, input may be passed that is less than or equal to SEV_FW_BLOB_MAX_SIZE, but larger than the data that PSP firmware returns. In this case, kmalloc will allocate memory that is the size of the input rather than the size of the data. Since PSP firmware doesn't fully overwrite the buffer, the sev ioctl interfaces with the issue may return uninitialized slab memory. Currently, all of the ioctl interfaces in the ccp driver are safe, but to prevent future problems, change all ioctl interfaces that allocate memory with kmalloc to use kzalloc and memset the data buffer to zero in sev_ioctl_do_platform_status. Fixes: 38103671aad3 ("crypto: ccp: Use the stack and common buffer for status commands") Fixes: e799035609e15 ("crypto: ccp: Implement SEV_PEK_CSR ioctl command") Fixes: 76a2b524a4b1d ("crypto: ccp: Implement SEV_PDH_CERT_EXPORT ioctl command") Fixes: d6112ea0cb344 ("crypto: ccp - introduce SEV_GET_ID2 command") Cc: stable@vger.kernel.org Reported-by: Andy Nguyen Suggested-by: David Rientjes Suggested-by: Peter Gonda Signed-off-by: John Allen Reviewed-by: Peter Gonda Acked-by: David Rientjes Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccp/sev-dev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -577,6 +577,8 @@ static int sev_ioctl_do_platform_status( struct sev_user_data_status data; int ret; + memset(&data, 0, sizeof(data)); + ret = __sev_do_cmd_locked(SEV_CMD_PLATFORM_STATUS, &data, &argp->error); if (ret) return ret; @@ -630,7 +632,7 @@ static int sev_ioctl_do_pek_csr(struct s if (input.length > SEV_FW_BLOB_MAX_SIZE) return -EFAULT; - blob = kmalloc(input.length, GFP_KERNEL); + blob = kzalloc(input.length, GFP_KERNEL); if (!blob) return -ENOMEM; @@ -854,7 +856,7 @@ static int sev_ioctl_do_get_id2(struct s input_address = (void __user *)input.address; if (input.address && input.length) { - id_blob = kmalloc(input.length, GFP_KERNEL); + id_blob = kzalloc(input.length, GFP_KERNEL); if (!id_blob) return -ENOMEM; @@ -973,14 +975,14 @@ static int sev_ioctl_do_pdh_export(struc if (input.cert_chain_len > SEV_FW_BLOB_MAX_SIZE) return -EFAULT; - pdh_blob = kmalloc(input.pdh_cert_len, GFP_KERNEL); + pdh_blob = kzalloc(input.pdh_cert_len, GFP_KERNEL); if (!pdh_blob) return -ENOMEM; data.pdh_cert_address = __psp_pa(pdh_blob); data.pdh_cert_len = input.pdh_cert_len; - cert_blob = kmalloc(input.cert_chain_len, GFP_KERNEL); + cert_blob = kzalloc(input.cert_chain_len, GFP_KERNEL); if (!cert_blob) { ret = -ENOMEM; goto e_free_pdh;