From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C6F20C77B73 for ; Wed, 19 Apr 2023 11:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=noidqGcKZ3tt2at2e+sPUqPrOt9Y9vO/M7GVfhWDiiY=; b=p7rQ/UvuBQMeC9 VgqCObBkvV6zcOzxNkf1sTvLRKGXKTRCJ0j+Ds4RDR8snsyto483fOT1kkV19GdGBZsU2Vp37TvAI ROlYE4gifUIQ2ofdg/acdYAsqvtj+ZQq0s9/OWaQNip8oYaHnbxM9JCMSd4sTwoRWEmAGpeMDfKRA pGW3g++ESzZ+drz5pNRezt1XNM/llEaoEgajoMmEtxGGm6v4FxtdqG38cbPratky22/Dk3V31Bq4l vXzY0O+xOH4mUOyusMy8Rj2V/+i+B+lAvhyrJz/gA9XasABO/DXkHfG0gU89xxzhUOBr8auEb4ok/ Dp5IIGaYFW/PFp3rCiCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pp62d-005BxC-1M; Wed, 19 Apr 2023 11:32:03 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pp62X-005BvA-1y for linux-arm-kernel@lists.infradead.org; Wed, 19 Apr 2023 11:32:01 +0000 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 0DB6362C54; Wed, 19 Apr 2023 11:31:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FCF2C433D2; Wed, 19 Apr 2023 11:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681903916; bh=BOmaM0I9OHCOiDjtSShZojXkWruy8giNbYp+VMACcyw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=I+z0hCSl6P6/Wue5eYh/nmR6P6+lQ22cp4Jc/x2oQaiD98pNGcyNZUdTDOYXJwOiA M8mRX63CaiBUyWYEl0O6Ef4yNStGNKTuSSZN4JTYAzvoVc9WXddSZjzzqV6GJCeg+R Qpw6i+PuiYJFykOHJ2ObrnYZocUA9Wi2SnVWH5lZed1FVaBc7YQuBHs1gbvuXU4c/I WK4SiyqUzCozftXulUsRSWmFABkxgDvicX3jES8LL+DghaAAXJ9UvWarEyp0lKOqqc 5vFuf4pxn0YKSV+wGr7+EuTyhrExiW4detYAaDp1/7sQG/TwLdwy9xS5BVGaCi82ek KI6mlSWRxqOhA== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pp62U-009ZFj-3j; Wed, 19 Apr 2023 12:31:54 +0100 Date: Wed, 19 Apr 2023 12:31:53 +0100 Message-ID: <861qkgkt06.wl-maz@kernel.org> From: Marc Zyngier To: Dan Carpenter Cc: Andre Przywara , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Eric Auger , Steven Price , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kernel-janitors@vger.kernel.org Subject: Re: [PATCH v2] KVM: arm64: Fix buffer overflow in kvm_arm_set_fw_reg() In-Reply-To: <4efbab8c-640f-43b2-8ac6-6d68e08280fe@kili.mountain> References: <4efbab8c-640f-43b2-8ac6-6d68e08280fe@kili.mountain> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: dan.carpenter@linaro.org, andre.przywara@arm.com, oliver.upton@linux.dev, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, steven.price@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kernel-janitors@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230419_043157_727868_11FDD16D X-CRM114-Status: GOOD ( 23.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Dan, On Wed, 19 Apr 2023 11:16:13 +0100, Dan Carpenter wrote: > > The KVM_REG_SIZE() comes from the ioctl and it can be a power of two > between 0-32768 but if it is more than sizeof(long) this will corrupt > memory. > > Fixes: 99adb567632b ("KVM: arm/arm64: Add save/restore support for firmware workaround state") > Signed-off-by: Dan Carpenter > --- > v2: The original patch was okay but checking for != sizeof(val) is > stricter and more Obviously Correct[tm]. Return -ENOENT instead of > -EINVAL in case future ioctls are added which take a different size. > > arch/arm64/kvm/hypercalls.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c > index 2e16fc7b31bf..7fb4df0456de 100644 > --- a/arch/arm64/kvm/hypercalls.c > +++ b/arch/arm64/kvm/hypercalls.c > @@ -544,6 +544,8 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > u64 val; > int wa_level; > > + if (KVM_REG_SIZE(reg->id) != sizeof(val)) > + return -ENOENT; > if (copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id))) > return -EFAULT; > Thanks for the fix. In the future, please Cc me on KVM/arm64 patches (specially this particular variety of patches...). Reviewed-by: Marc Zyngier M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel