Message ID | 20230307165926.158959863@linuxfoundation.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2628175wrd; Tue, 7 Mar 2023 11:50:24 -0800 (PST) X-Google-Smtp-Source: AK7set/au+tko3pfm+NzYJgqbIunMK3EFv2g9QwlwoctGwnxM8tVcJd86+JbY+zHKs03Llev1Bks X-Received: by 2002:aa7:cfcb:0:b0:4af:6c25:ed9a with SMTP id r11-20020aa7cfcb000000b004af6c25ed9amr14623823edy.29.1678218624100; Tue, 07 Mar 2023 11:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218624; cv=none; d=google.com; s=arc-20160816; b=pvFFsdbvLBXtH4Wq3mjCeitCQIf5uFdCMPikKljXcJPk5e8oDvpr+sgEg3MFKZgTmv 4iUWsUK7wMJW7iqfqZCJQjgfZfq/i9tPwDFTd3lzyw7meXhn8R1xHFj+M7WFc999hlgv lQDvJtuSamomxtDe2cYKv6UyNoBqI/fTLUN0DmX0j1cVojeDEch0vi2qEIno/lOEoERf BipeyNQmHdwaWs81jDfHXd2Zl1HMcXn+NclEhS0pN4pjDq6J3pi9m3cqIizfazCeoFKi J5ZGJiooG2tg//na9STe+S9igUAVQbUGNwoGWXpEefYDRXZtnTm0Hoh03v73tkoG6gUR Pv8w== 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=SrM9Iel6qJN/+QZ2pVQAY7t1aVbcu8SFiDsDYt+GKdc=; b=I4BdKfMwv+zc6PuE3Qrx5bguZO1PZaAIyQKWizGWNUHI4Whn5rXekiq9URDagp1DTb XRk9GcSXE092IpdNryqCK/9F5X59HDOMMmJIJpnf1mnrO74UAkSY08IXo7SvGUB1VgA2 o9VOT/YX3xJPpVt2nW6AQz+Lepn6zc3MIwffFei9dFULaUkdtXzWyFJP3cAQDYwahK7Z DADVnb47p0gpi8ltOU4QCw013WOAwt1EjSt8OuF6fI6lVLSLmPlDddxV43ioTDk6DTvi mwJ6VNqqqbM38XUNy+BEkbhpkk0k4KcjrVE8gtyd+rV5RUf6TyYkc2aHvCBmCZFJ7HR5 YfqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EwHS15Yg; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v10-20020aa7d80a000000b004ace747e72csi936238edq.302.2023.03.07.11.49.59; Tue, 07 Mar 2023 11:50:24 -0800 (PST) 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=EwHS15Yg; 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 S234037AbjCGTYO (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 14:24:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234110AbjCGTXy (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 14:23:54 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A227ACE2B; Tue, 7 Mar 2023 11:09:25 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id C3741B817C2; Tue, 7 Mar 2023 19:09:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 347C4C433D2; Tue, 7 Mar 2023 19:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678216162; bh=kv61pPeZdtdgwx4Z+2SU5Ux9voCWAYw/Wef2lFVUXR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EwHS15YgmZfC7nWEekBy0VWecv4ceSu2Ii+YrBjksnSmkqlZTxIbjFmHlqXAL6VSj niwYQeuQ9wk9cFjthClMYiqoJlN3ItsZZhYBwzfsR54bcJY/qIFrhF7KM2D5sXDPyk VFPK7qAVGsDMXsjPQCcbKS65dp/gXshuxE1gPkyQ= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, patches@lists.linux.dev, Andy Nguyen <theflow@google.com>, Thomas Lendacky <thomas.lendacky@amd.com>, Peter Gonda <pgonda@google.com>, David Rientjes <rientjes@google.com>, Paolo Bonzini <pbonzini@redhat.com>, Sean Christopherson <seanjc@google.com>, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5.15 468/567] KVM: SVM: Fix potential overflow in SEVs send|receive_update_data() Date: Tue, 7 Mar 2023 18:03:24 +0100 Message-Id: <20230307165926.158959863@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307165905.838066027@linuxfoundation.org> References: <20230307165905.838066027@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,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739772260276482?= X-GMAIL-MSGID: =?utf-8?q?1759739772260276482?= |
Series |
None
|
|
Commit Message
Greg KH
March 7, 2023, 5:03 p.m. UTC
From: Peter Gonda <pgonda@google.com> commit f94f053aa3a5d6ff17951870483d9eb9e13de2e2 upstream. KVM_SEV_SEND_UPDATE_DATA and KVM_SEV_RECEIVE_UPDATE_DATA have an integer overflow issue. Params.guest_len and offset are both 32 bits wide, with a large params.guest_len the check to confirm a page boundary is not crossed can falsely pass: /* Check if we are crossing the page boundary * offset = params.guest_uaddr & (PAGE_SIZE - 1); if ((params.guest_len + offset > PAGE_SIZE)) Add an additional check to confirm that params.guest_len itself is not greater than PAGE_SIZE. Note, this isn't a security concern as overflow can happen if and only if params.guest_len is greater than 0xfffff000, and the FW spec says these commands fail with lengths greater than 16KB, i.e. the PSP will detect KVM's goof. Fixes: 15fb7de1a7f5 ("KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command") Fixes: d3d1af85e2c7 ("KVM: SVM: Add KVM_SEND_UPDATE_DATA command") Reported-by: Andy Nguyen <theflow@google.com> Suggested-by: Thomas Lendacky <thomas.lendacky@amd.com> Signed-off-by: Peter Gonda <pgonda@google.com> Cc: David Rientjes <rientjes@google.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Sean Christopherson <seanjc@google.com> Cc: kvm@vger.kernel.org Cc: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Link: https://lore.kernel.org/r/20230207171354.4012821-1-pgonda@google.com Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/x86/kvm/svm/sev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1277,7 +1277,7 @@ static int sev_send_update_data(struct k /* Check if we are crossing the page boundary */ offset = params.guest_uaddr & (PAGE_SIZE - 1); - if ((params.guest_len + offset > PAGE_SIZE)) + if (params.guest_len > PAGE_SIZE || (params.guest_len + offset) > PAGE_SIZE) return -EINVAL; /* Pin guest memory */ @@ -1457,7 +1457,7 @@ static int sev_receive_update_data(struc /* Check if we are crossing the page boundary */ offset = params.guest_uaddr & (PAGE_SIZE - 1); - if ((params.guest_len + offset > PAGE_SIZE)) + if (params.guest_len > PAGE_SIZE || (params.guest_len + offset) > PAGE_SIZE) return -EINVAL; hdr = psp_copy_user_blob(params.hdr_uaddr, params.hdr_len);