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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 425B8C61DB3 for ; Sat, 7 Jan 2023 01:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236836AbjAGBKn (ORCPT ); Fri, 6 Jan 2023 20:10:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236402AbjAGBKe (ORCPT ); Fri, 6 Jan 2023 20:10:34 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2F5F848D5 for ; Fri, 6 Jan 2023 17:10:30 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id j18-20020a170902da9200b00189b3b16addso2233451plx.23 for ; Fri, 06 Jan 2023 17:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=LV2RtCx7AgI4jwo15Fa/1V+X8I2HVQFzUwPIYOqkwuM=; b=RB0P+AiM7Ro6qxXSPF3+Sp9LanhO69duwhhSSgPfbLzQX1hAhPZ9YyOopGd1vMiuX6 67K3IfOePjx3hVXxgft+SzLK8wCmCzQTIhgeHB+BQVfqf94kiS+zvq2waY9ztBvTRV83 BiwVZQwxeLB0WKivldbm+ZhsPF/dqhdTxWuaPck9nML4vD5wsTqENEULq2yxCpoitrVh QkXEIWaquzKahVnoedYm/fQ6GJwAdSFD4CoNcX73oywhUb3z1ETpDva+ItRqAiMeqvqQ cgLx23h6rc6sssovy3wdMbZXXKIR6oj8rmNJkN0Q+mrnOtgILXUXZ2+V95MYcnaUYILB 34Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LV2RtCx7AgI4jwo15Fa/1V+X8I2HVQFzUwPIYOqkwuM=; b=Wl4usCJ8jjCAhGr2xZbdp1DzeZGt4GJNbdV9/xjQYP8QbGeMU41YPUBsZ2Wm6mpOn2 CAsB0z7JQUNn/vO3NY8jdFp6v3v9Oj1TOz2xa9BYmOYdlTQocRiqWVIApMGHgNrBXPSq sSNaSsjyRjeUwnAdFuA7fL13YCLKCPrVKl170nrEyMN9+Si6X3SiiVQJckHoxi5K/EOv na02+08ZckHv8vKqDMJ3BX5t91Q62YW0Ga0qpoJC+kAuEOMF/5mGSpS/UGyc93QbGDCX EK3lbKKE5d4nGLk0/aWtn9WkXcVrQ8NQDEidzIdaxkyfrQsiFVI2Fvwt4Wl5aJ/R75Pb ffXw== X-Gm-Message-State: AFqh2kpd2LKasK9ah6L2zFx23of/6GksmdvixTGw6Uxq42BnJdNNc/h9 o3uVb5Uzg5EkpicJ5o3czMOqbWQnJEA= X-Google-Smtp-Source: AMrXdXsyXZUOj1a/2/DniWCHXzsM4PEJ3Kwwp5WBDrvDVi3eDp1/faIIPIhPetyQes+WaMJb8b6ximeom1A= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:2487:b0:57a:a199:902f with SMTP id c7-20020a056a00248700b0057aa199902fmr4031049pfv.52.1673053830336; Fri, 06 Jan 2023 17:10:30 -0800 (PST) Reply-To: Sean Christopherson Date: Sat, 7 Jan 2023 01:10:20 +0000 In-Reply-To: <20230107011025.565472-1-seanjc@google.com> Mime-Version: 1.0 References: <20230107011025.565472-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230107011025.565472-2-seanjc@google.com> Subject: [PATCH 1/6] KVM: x86: Inject #GP if WRMSR sets reserved bits in APIC Self-IPI From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Orr , Ben Gardon , Venkatesh Srinivas Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Inject a #GP if the guest attempts to set reserved bits in the x2APIC-only Self-IPI register. Bits 7:0 hold the vector, all other bits are reserved. Reported-by: Marc Orr Cc: Ben Gardon Cc: Venkatesh Srinivas Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson --- arch/x86/kvm/lapic.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 80f92cbc4029..f77da92c6ea6 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2315,10 +2315,14 @@ static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) break; case APIC_SELF_IPI: - if (apic_x2apic_mode(apic)) - kvm_apic_send_ipi(apic, APIC_DEST_SELF | (val & APIC_VECTOR_MASK), 0); - else + /* + * Self-IPI exists only when x2APIC is enabled. Bits 7:0 hold + * the vector, everything else is reserved. + */ + if (!apic_x2apic_mode(apic) || (val & ~APIC_VECTOR_MASK)) ret = 1; + else + kvm_apic_send_ipi(apic, APIC_DEST_SELF | val, 0); break; default: ret = 1; -- 2.39.0.314.g84b9a713c41-goog