[6.2,0833/1001] KVM: SVM: Fix potential overflow in SEVs send|receive_update_data()
Message ID | 20230307170057.940444308@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 v21csp2623813wrd; Tue, 7 Mar 2023 11:39:43 -0800 (PST) X-Google-Smtp-Source: AK7set/aSB3tyWfvoLNAh3HU6Nt0xopj0n/xs5EKxm/Z859NKG9ONm8k494Cp4yXXqteRj9jrt61 X-Received: by 2002:a17:907:c0c:b0:8af:2cf7:dd2b with SMTP id ga12-20020a1709070c0c00b008af2cf7dd2bmr20021425ejc.13.1678217983443; Tue, 07 Mar 2023 11:39:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678217983; cv=none; d=google.com; s=arc-20160816; b=vLLO1Kfk2F6D44xVUiNIWYLrrfEjC06jt5K6yTMCyMriUmBoWGa3XC1loclaGLb3/a jga8GhZWHUBWlhXVfsKSqZwZ/bjt/Bk8lzmIdhwS9dn4Uk6i6p7vfsvC6lbUjeYLiXVo fS+vqWfX4Flxw78qmoKiAl5/rdl625CRt7/ek3Cqi5c8vDTXZhVZXGkN2+LnK1bPOLGx VDMFomtXiTZ+NFJp2mM8GvtcPS93ExDu031k3/vuA0i053yqUmUZYM5mvxw8lQM4ZuqW AggxpUrXnZuQJ/7LMHTGJt1X+1g3nlV6s4dhjfFgI3gd//mU9u9IAh98du1XG9t7Lzzc FnGg== 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=FGG5M9Jciv5ozPgD16m2xwR30n69LaHsgg8XMcoV5OawZzPJBuexS2SSNVkrEhF3ac 0NGXw1cDwUg9ybhZEQkxnwQHdLA2tLx+5qOwJNjAybypyJCn1UPO5XYto3AU5RRPpz+u pLpSmJEeXI8KV+LV+qJwHbV3Ed0vrOT1ImGEtZ2zpXnx6dwx/rB8+i9at1LI7CoIcpF7 99xbY0AkC8C6v2v0wv2ybfZyEd1vpUVLu64rt8EYMGObEsgkchx100USOm1lcWYpsTdR OmfZqHFINF9Z37TYgkX704qeY5+SKNi+IQEEF8j2c8NBQZWy61U6ab9IZms2edUKwgVy MT1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ayuyW1a4; 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 e18-20020a17090658d200b008b194cc10acsi17510958ejs.381.2023.03.07.11.39.19; Tue, 07 Mar 2023 11:39:43 -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=ayuyW1a4; 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 S231825AbjCGRyn (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 12:54:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbjCGRyS (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 12:54:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE46994F68; Tue, 7 Mar 2023 09:49:07 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 95DBA6150C; Tue, 7 Mar 2023 17:49:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E30BC433D2; Tue, 7 Mar 2023 17:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678211346; bh=+M1gEsg3qEIv515pBeyxMHFtrxXp6A5XzXwfNBlR9Zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayuyW1a4AeqVn0puUPO6lGfTmriye8wkvkSK/4ASJXZ2qIEmGn6HekvZQAG/7k6YZ dIsNSaw+GpGqPPFFpU9VRkr2Ri2LjM9h6eisnnTRQ/zULEBCzRMUxPDKC6mow/Dy4m EjN46CuHUGtZwbFDXrSfDRTAwAN6hT6+hlxfYGUg= 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.2 0833/1001] KVM: SVM: Fix potential overflow in SEVs send|receive_update_data() Date: Tue, 7 Mar 2023 18:00:05 +0100 Message-Id: <20230307170057.940444308@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@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?1759739100207348269?= X-GMAIL-MSGID: =?utf-8?q?1759739100207348269?= |
Series |
None
|
|
Commit Message
Greg KH
March 7, 2023, 5 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);