From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5934437878 for ; Fri, 31 Jul 2026 15:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785510541; cv=none; b=Zf0qQj0J/h7EgIoFdzjv9FrfIz1xU7EpTl2Vz8NGTTs+5e6bKwonDjWcHC/E9pS3UMH1GkmukB14GO7WI1aHo1Bwnyt2HmQBdh1ZUhQz6LkkagPxrskBg2JfSAkdrm8dY4HmMEsbAFmvXqGuKKfuxXzIGHt3xXjos6IcK3q8FZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785510541; c=relaxed/simple; bh=AIVWrh6CF4CKx4RF7vzN6YiuXpAZvS5KqSwfzePjOCA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fXeFounlpymyK8KJbBsZxQx7e6Pxye1gGQBPaDyozIX6f8/PQAXPqHLXc0bhThhNOfestkManZchPtlJEJ/Fac9+743H2kPPdArFCeYWErkhur1sq9liX0cMetejsT9v4OCr3hOLJZLA5R8jfY1/wqOJad7K9A6wJrY6/OgfxF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=JkGWWF5g; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JkGWWF5g" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-c15dd4b9132so173073366b.1 for ; Fri, 31 Jul 2026 08:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1785510534; x=1786115334; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=gOaXPDNzFmfCcFZASeKm4HD2Emk8ASo1ynV4rSmHLg0=; b=JkGWWF5gOjxkMrtpUQnC0kHCKCA3ttjqTCMdQPIQE2A5UYwLq1eZL4gKLP0DQkuRt1 n0DZRcuOr9wrD1JRrLw8AAIUsjdiLUdraGfE14xZ/yooQKHdvOBT4aDlBOe41XykaCSh 9csXID9vksGdyUNwsRh43D2hL2GY3ojFIfix8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785510534; x=1786115334; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=gOaXPDNzFmfCcFZASeKm4HD2Emk8ASo1ynV4rSmHLg0=; b=dxQdXgkFNVVxviGDhKaK8hJm3+DERnd3jCJq74twA4mbD82ejpCdWfODyz2noT0NNO oiFaOgkjM+5mReMO7EvI9DmGUORbPusxs1apbf4RK/FdyAeEpjMjubnHW96NDQH1qbno NRHBUdTpHyEfpPezZxM+KmHmUsIvRjvjMCu0+AtzSsuDzywfbIh1hHVNBwa/7S3lcH+n 8sC9+46F5V31bGT7MATg8mQ7o4sFzdV97fYje5/tvK8kU9mvh3FLvMINz+Kk2smMalP9 PJ2RMW3kRuC4M8JI1zrrtm9bA0qAkDSCIA35wbDqCkRNIIPoIkevSBAUtEIpI4+Vfn59 BpsA== X-Forwarded-Encrypted: i=1; AHgh+RrQHMm+fOLZ+cIsFlK9wWWGwDWrufS4wj9Yjo1Q6rwM+e/mY7l73Io08N18NTGXTbLm5LNXaiu5gZY=@vger.kernel.org X-Gm-Message-State: AOJu0YyJwn/caXwNMSKCU8RKQny1Fgh1ZX5PQ/8w8zsw6c8+9oAjMf9a 5VrOEzMPef9RdltioVxf1pJc3NLqZqo55ilExTVoiiHPsCLWj1sGMhK3af6UWs9Jew== X-Gm-Gg: AR+sD11pDdO2m0508mZ1mtttTulBqkPwSVd6pQLU7j8ww+1qkeNmG7uhDV3KDsxUAXC 78czC+y2K8GnKE+cZ0D5Q/H4DNSIETQ8WINTZ2UqEZxjQI276xoVN4TFHE9BV9B8RB2+Iok15L1 QcrOEuUP45btF1nzLBK32z36uhs2rBm6aPeT7I5qq0wzLSVHV62vcueaZ9puni34NEh4ZMgH7x9 xvoUY2DKcJHJnB6FqD/ngEiw6pWdK7KHtiep5dmNRbGmfCb3eV566zQTmU/4+erkDuBjFGozgUL 8kBInpWJLCXNEvrYm98+56TsHxvneczlbURQu7FMHT6DVpYj366cUWE8b4hbwJEmw8AZwzRxzqo ScEt9KWI9b8NhquYHRhPUD50X2QhUkOSXZLvzGDU2uq5FbKoV+MeNvAisGrWrv0H1hklbbeJOPS rgApFicwx1nkjyElm8pFUNFg/KQHDup/KAcqN07WAAbFbEuNUk7eet6QEsbVYgCKtJBTWogUMp1 v7p4jzAi9mbPf7YoHjUb6jQUAIrGg3nIyBxJGCIR5HHOKQ6ZzhDxZs= X-Received: by 2002:a05:6938:a08a:10b0:c1f:e172:cf16 with SMTP id a640c23a62f3a-c1fe172d0aamr53127366b.46.1785510534451; Fri, 31 Jul 2026 08:08:54 -0700 (PDT) Received: from dmaluka.c.googlers.com.com (110.121.148.146.bc.googleusercontent.com. [146.148.121.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fd45a0c8bsm5647974f8f.34.2026.07.31.08.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 08:08:54 -0700 (PDT) From: Dmytro Maluka To: Sean Christopherson Cc: Paolo Bonzini , Dave Hansen , Mathias Krause , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Vineeth Pillai , Chuanxiao Dong , Aashish Sharma , Grzegorz Jaszczyk , Dmytro Maluka Subject: [PATCH v2 2/4] KVM: x86: Fix off-by-one in max_vcpu_ids bounds checks Date: Fri, 31 Jul 2026 15:08:43 +0000 Message-ID: <20260731150846.1728164-3-dmaluka@chromium.org> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog In-Reply-To: <20260731150846.1728164-1-dmaluka@chromium.org> References: <20260731150846.1728164-1-dmaluka@chromium.org> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit max_vcpu_ids and KVM_CAP_MAX_VCPU_ID are exclusive, i.e. the maximum allowed vcpu_id value is max_vcpu_ids minus one, not max_vcpu_ids. Fix sanity checks for KVM_SET_BOOT_CPU_ID and KVM_CAP_MAX_VCPU_ID to correctly fail when bsp_vcpu_id is set to max_vcpu_ids, not to a value below max_vcpu_ids. Fixes: 7c305d5118e6 ("KVM: x86: Limit check IDs for KVM_SET_BOOT_CPU_ID") Fixes: d29bf2ca1404 ("KVM: x86: Prevent excluding the BSP on setting max_vcpu_ids") Signed-off-by: Dmytro Maluka --- arch/x86/kvm/x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 47cb9eba113b..b576b46869d2 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6908,7 +6908,7 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, break; mutex_lock(&kvm->lock); - if (kvm->arch.bsp_vcpu_id > cap->args[0]) { + if (kvm->arch.bsp_vcpu_id >= cap->args[0]) { ; } else if (kvm->arch.max_vcpu_ids == cap->args[0]) { r = 0; @@ -7478,8 +7478,8 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) mutex_lock(&kvm->lock); if (kvm->created_vcpus) r = -EBUSY; - else if (arg > KVM_MAX_VCPU_IDS || - (kvm->arch.max_vcpu_ids && arg > kvm->arch.max_vcpu_ids)) + else if (arg >= KVM_MAX_VCPU_IDS || + (kvm->arch.max_vcpu_ids && arg >= kvm->arch.max_vcpu_ids)) r = -EINVAL; else kvm->arch.bsp_vcpu_id = arg; -- 2.55.0.508.g3f0d502094-goog