Message ID | 20230307170033.579012894@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 v21csp2627275wrd; Tue, 7 Mar 2023 11:48:15 -0800 (PST) X-Google-Smtp-Source: AK7set8fmhD2AfytLboWHfhJ+I1acWbSUUX9oyp+ilebhkkl82a9y2RWXHYUjGXesIPCEowAkuCo X-Received: by 2002:a05:6402:1605:b0:4af:601c:ea21 with SMTP id f5-20020a056402160500b004af601cea21mr13405027edv.38.1678218495327; Tue, 07 Mar 2023 11:48:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218495; cv=none; d=google.com; s=arc-20160816; b=rVKlNhyNihPIiRe7/O1uxjSp6ZjeR0OQOMc/Q1xknSMfPPI6u9XibmSR9WqDu2ux2H r0ZlS2cg9rDRxQVu7YC9MfFMpPg0cn98CebHQEx53t4V1XpuSMKK6d4Nq+1ySyGOZvuo u0rix9Lm5R908iJfF6sZc45XpYb98GfeTuJMSVUsAaao/qTPejzN6BNpsLivFMZtdxr1 f8xQ1ya9OQB2klE0Bp3zX+r/G3IL7/bWk0plliKvc1cL9xz5GABSMWphEquGl1fNKZUl Ni4pUcCFpxc5N5LtZEde6J2z1bLBkpNhUKab+Sw2/BQnJz3lt/SP2Kqh0kHD3zJaB9ya JI8A== 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=FYHFfQzaxpiVfBr9Ol6aKTuHCCtuYhg59kJioGs6NF0=; b=FM5u+/o6h3TYlZh0q2pcsqDcVOyDfPZRK+IvLBpsov/9s7N4L7W0YuSY3EfeplAHNp 5NWc7WkVG0/vqoNyqzdvAjR6CAJBu9+arXgRZJTWxNbtnWqptFtt3L4mUQokPlDWCsmJ jQxl/dlco3WtFjwTZQ0OxZ30zl6uY/3SLFVy7tdJaHXls1jLrF6XZfBbN2yH2nyJiSg1 GZWoYVFwmOOO9jcos+kPYivJ1c8vfiWBK4OgaVDeBUToJoL3KY/ADTdMBqEDTmgUyxhQ 714lbLz/Kl1Gb6WW5qXuJQqMiqlQzyZE2GKqVpoMPPmm6/1YyWkaBosqkDDmt0U1/++8 sBEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Fp/4fAIP"; 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 c17-20020a170906d19100b008d3be841ccdsi423244ejz.326.2023.03.07.11.47.51; Tue, 07 Mar 2023 11:48:15 -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="Fp/4fAIP"; 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 S233256AbjCGSrE (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 13:47:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjCGSqd (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 13:46:33 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D7FCB5B54; Tue, 7 Mar 2023 10:35:47 -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 D61D9B819D1; Tue, 7 Mar 2023 18:35:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49D5BC433D2; Tue, 7 Mar 2023 18:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678214118; bh=+M1gEsg3qEIv515pBeyxMHFtrxXp6A5XzXwfNBlR9Zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fp/4fAIPZV+hzE2P1sSMIf3fDMqXIYQqptrfj9+jdyZncb8uISz1afwNq5ihiR5Tn wAWsHdI36GaehkKFazNlHp9rr+jLW0Y38IaTJK39L0zJW9fH7t31LiytQ/g4UzfhJm tWrCYmFKZSsMzgsyTaNZzqICv6LApnf2y2MEbans= 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 6.1 727/885] KVM: SVM: Fix potential overflow in SEVs send|receive_update_data() Date: Tue, 7 Mar 2023 18:01:01 +0100 Message-Id: <20230307170033.579012894@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170001.594919529@linuxfoundation.org> References: <20230307170001.594919529@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=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1759739636984741335?= X-GMAIL-MSGID: =?utf-8?q?1759739636984741335?= |
Series |
None
|
|
Commit Message
Greg KH
March 7, 2023, 5:01 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 @@ -1293,7 +1293,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 */ @@ -1473,7 +1473,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);