From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7909313AA37; Tue, 14 May 2024 11:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686304; cv=none; b=CHhfePfe2QL1HRTbqIDd1jNqUhNfRm1NbqAnN5pn7hdQp0NQNdLqnY8JHbgczj3nW4O20Uy0FoSblmQxbKZb4A/8p+J4yqmDqgGdGi8CbtsdqjXitooVNB/H1jRxgkw+ixzjH9y1ADscrVi4IczIPFw1xdxnAKYI2I5rmmS0Qjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686304; c=relaxed/simple; bh=17MLXq0HamUWyq9OMNNvKXWKtw/19BrzuvgHl8f61fw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hAfj2Ft7LX70PAUaxzQn8wPRvMjdvVTv03kIpXt+C10BNjKzUvdu9H77vo0nrxYLsSqnegeeLCSweQ37X47NAODKCP9nzs1IuL07P+gm2undhO+aZlQbWQsV1wnt9CQiXunAUnC5FczvZYfJWSw2egN9E8v8i8agD4IQstLdMbM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OUOr8QMi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OUOr8QMi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD430C32782; Tue, 14 May 2024 11:31:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686304; bh=17MLXq0HamUWyq9OMNNvKXWKtw/19BrzuvgHl8f61fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OUOr8QMiV+QdPrOYmchglZNkmqgoGI1G82Xb2ZzdHHi00WFF7KHelmsNUGTIrV0Xc bdWIKzxuntNw1tbSX5Y76MShLlys2ROZaGei2h5Z8a6RW+KSKB8G+gGtTApMjVGdro 6MqP3xnNQwX76nL/5VuEA1F0aBiTPH7n1o0gAm0Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Potapenko , Marc Zyngier , Oliver Upton , Sasha Levin Subject: [PATCH 6.1 092/236] KVM: arm64: vgic-v2: Check for non-NULL vCPU in vgic_v2_parse_attr() Date: Tue, 14 May 2024 12:17:34 +0200 Message-ID: <20240514101023.863227511@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101020.320785513@linuxfoundation.org> References: <20240514101020.320785513@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Upton [ Upstream commit 6ddb4f372fc63210034b903d96ebbeb3c7195adb ] vgic_v2_parse_attr() is responsible for finding the vCPU that matches the user-provided CPUID, which (of course) may not be valid. If the ID is invalid, kvm_get_vcpu_by_id() returns NULL, which isn't handled gracefully. Similar to the GICv3 uaccess flow, check that kvm_get_vcpu_by_id() actually returns something and fail the ioctl if not. Cc: stable@vger.kernel.org Fixes: 7d450e282171 ("KVM: arm/arm64: vgic-new: Add userland access to VGIC dist registers") Reported-by: Alexander Potapenko Tested-by: Alexander Potapenko Reviewed-by: Alexander Potapenko Reviewed-by: Marc Zyngier Link: https://lore.kernel.org/r/20240424173959.3776798-2-oliver.upton@linux.dev Signed-off-by: Oliver Upton Signed-off-by: Sasha Levin --- arch/arm64/kvm/vgic/vgic-kvm-device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c index 97ead28f81425..63731fb3d8f63 100644 --- a/arch/arm64/kvm/vgic/vgic-kvm-device.c +++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c @@ -337,12 +337,12 @@ int kvm_register_vgic_device(unsigned long type) int vgic_v2_parse_attr(struct kvm_device *dev, struct kvm_device_attr *attr, struct vgic_reg_attr *reg_attr) { - int cpuid; + int cpuid = FIELD_GET(KVM_DEV_ARM_VGIC_CPUID_MASK, attr->attr); - cpuid = FIELD_GET(KVM_DEV_ARM_VGIC_CPUID_MASK, attr->attr); - - reg_attr->vcpu = kvm_get_vcpu_by_id(dev->kvm, cpuid); reg_attr->addr = attr->attr & KVM_DEV_ARM_VGIC_OFFSET_MASK; + reg_attr->vcpu = kvm_get_vcpu_by_id(dev->kvm, cpuid); + if (!reg_attr->vcpu) + return -EINVAL; return 0; } -- 2.43.0