From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 28D154DD6C8 for ; Wed, 3 Jun 2026 23:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780528049; cv=none; b=vBJrC00cG84dI1RHBqD14nCNOfiur4Fwa9CC56SzfRz43w7bVrYa+y0igsfxc8wB+YqEmblBEOnBeAf2mYUUX1FEcjqJ4hwY8vSqRaWVPfSTCUGISMe9XzHRRrj+oYfCr3XphC+Dgkbms75fgUCzqEgvxAGphEqefKr+je3NBaA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780528049; c=relaxed/simple; bh=bHzLLdTCb+VxVJ3+VJQO4wCCyjKFKuVLfk1jhmZ+WeY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FBhR7EzjmI5B2fjVVgET4JmnJ1cHkJh4rLH6CMxe/oo0BxP7LI01s0OWxQz8kPMj+oVk880FIeCH74sGTfmvmmtFyUWwdjeoSFLehFyXGia7NbCU1fR/oXARVwVzOxAwkdP/iglaXPGMRuHOhDO7iH9hkTEfrXdSC3qlc0TBV94= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=F1fkQDwv; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="F1fkQDwv" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-84233efcaadso51531b3a.1 for ; Wed, 03 Jun 2026 16:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780528044; x=1781132844; darn=vger.kernel.org; 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=ezUSvHHU0F8Pd5Mai5Tb6QADKDnvgIyBgfFvIrwmlEA=; b=F1fkQDwvgni1nRcXY01pgS5FW2pKlXNgkoqvsBQXGjYeWSXNp9eiMYK6XBErzuCdFg 9ROcn7+SYnRln01LMMaIHWLyuYjPUc0IbnlZkH5Ar8vl2ojhb7gnkiP9HMJdgT53R7IH NeZYf99w5IdYPENReokxvI6f/LuxD6DDlMz2KN0ZtzdRKICPzONBNyhxGCiKTGmEqjoo qGLeKlCL/YdwZo93gp1sDs4pYeNZl1spBhEulI+vL0WqwXePuMlQB8zsP7JyXkg1XuLT GiN+DRMWkgwUHM+ofILkm0ZLLVjv/4xfQzyejBTY2q/LMvSrZgtlkpj6Km0UiLHSS2UP nIUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780528044; x=1781132844; 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=ezUSvHHU0F8Pd5Mai5Tb6QADKDnvgIyBgfFvIrwmlEA=; b=V/Jrul1QD6xZ+hXoupVKi0aMeIhKhT+ZIQgtbv/qgOWZa43OhAtcpBvmnDZbVmr2/v SuiCpCu4mhFQSjImekUkzIIyaubZd7PM2xDoZ9ohB7ABh2P3f+ZhBrRJ7OTwNkp/Y2Lv 2Hi4qwDcbXvviL9u7QVRg6h2fcHBwuu8KNuVHeAamSpXAqKM20mO2Frb18WmJXCu8JSs NA5ef2fdu08DM+P8CHaJGjCLYqC94quimZon/B+LPvYnJxnLczNzo+aKEDZItYT4w+nm oMlfOzS5GGkAOUPDS/d799v1FdytaHPR5UjyjiSznHDbeO9aq4svo50o/yc3PUZsZ8Nb /l1A== X-Forwarded-Encrypted: i=1; AFNElJ+cxwrAR5ufD0uid82jSTaE9jmwm2+0LI4MUDxFrmWukHA6zbp4yiRHzFHwRoKNw92SUfQpWJ4Tt5ltURc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3NZ44LZ9Ms+HNL4kuMLoOR8kCjjcEfq9buysHL3USvlRHdxt+ nRz90Iw1JwaZOb7YA4bYnbbd7Y4T+2MrFoeU3ly0XJ7cgmwR/llU2bxvtwNM7UirA3ODwZ20IBP Pufs1NA== X-Received: from pfble1.prod.google.com ([2002:a05:6a00:4fc1:b0:842:3fef:b24d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:338e:b0:842:6c02:2fa1 with SMTP id d2e1a72fcca58-84284f34cc8mr5211256b3a.39.1780528044287; Wed, 03 Jun 2026 16:07:24 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 3 Jun 2026 16:07:16 -0700 In-Reply-To: <20260603230718.1733483-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260603230718.1733483-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260603230718.1733483-5-seanjc@google.com> Subject: [PATCH v2 4/6] KVM: x86: Use kvm_dr{6,7}_valid() to check DR{4,5,6,7} write values in emulator From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, "=?UTF-8?q?Carlos=20L=C3=B3pez?=" Content-Type: text/plain; charset="UTF-8" Use kvm_dr{6,7}_valid() to validate the incoming DR{4,5,6,7} value in the emulator instead of open coding an equivalent check. In the unlikely event that the behavior of DR6/7 (and their aliases) changes in the future, using common helpers will hopefully make it less likely the emulator logic will be overlooked. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/emulate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a1bccab0eefe..1df2dcfd8bef 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3861,10 +3861,13 @@ static int check_dr_write(struct x86_emulate_ctxt *ctxt) switch (ctxt->modrm_reg) { case 4: - case 5: case 6: + if (!kvm_dr6_valid(new_val)) + return emulate_gp(ctxt, 0); + break; + case 5: case 7: - if (new_val & 0xffffffff00000000ULL) + if (!kvm_dr7_valid(new_val)) return emulate_gp(ctxt, 0); break; default: -- 2.54.0.1032.g2f8565e1d1-goog