From nobody Mon Feb 9 12:39:10 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 97E7A2FE074 for ; Mon, 26 Jan 2026 04:22:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769401332; cv=none; b=a2IT9XdFbwMDHgvaBvuK36YuxF9KQURt6UjA7B2dZQ1/Db6lQi2wAiDv35zQmpje7bRSoj/Z8J9E+PhReOZuTHZ1i4V/vkYgrdoQvJOr7UtAK+TY3BUjSCMBpCitTsRqLnvouhnA71OCa06hcj0xsQxFj5XXet0foJZAz0gfyug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769401332; c=relaxed/simple; bh=b7vzXhNZ344WsXhALdtWAycQWLse+ilx7mZmjlgIEdk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=iLJ4ZwxQki9F1WMy+wWf4La2DwicVb3U31b8Q7aGlUxNJqVzDqWUIFlFmQ3RCHRdPmN7PWdcgL1vNTiyD/NiM2lpJIqSukma6fzATOyoq7272EVmtFbpHYUkwN64U1Iyrr2Mxt4z7uaLhggJ23a4VUj2WOjRNkgBO4pFkpYqk6Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Hyuh4+2O; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hyuh4+2O" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-29f102b013fso37550835ad.2 for ; Sun, 25 Jan 2026 20:22:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769401331; x=1770006131; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MXMmWr4x1kiDa10LjI5HvINcv2KnVZhp4gqQTuAdZ/M=; b=Hyuh4+2OpQMCcpedrWvGd2RbMOLMO6d+k5FhuIzFIpg6xFJekS1fkjLp2qawH+Tzgb jFnb/CCftSf/flBZOuTYTTrXDg6unW0UqQdGPOPL4gx4QVy687DDEkkM+H4/++byGEZh DieIAsnfdVfq8L2qBD27nWIWZZ07Gfqs9qBXevhLuKJ1saqiCpwGz9nWV07h8tHfZvWG DK5h/q0t0j41lSfeOWDVpKUqZhHHQ0cW7Jpce+o4kHFRpj6iznUq0ErBo7a91vw0heuZ bI4Mga2SHrOP6HpZHHSSFGNP6RGj1OrFiCqh7QmNicHjvDjQHhyHrQquvt9yoyzH5NZI U9cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769401331; x=1770006131; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MXMmWr4x1kiDa10LjI5HvINcv2KnVZhp4gqQTuAdZ/M=; b=Fqn6uQzWQY/LmBqUi5tid383UY02MpNN2sTR9KqNrRWTO1PVXBJWks8haoMpH56a+B FDHolVwBkNN+4E6CGt884D5pZtp/xYW2lSGMPhlZrxAMfJRGoxdqJ2BAhDohK9M5c8iL v3S3VHr3F347O+1KJG7UDoYXbrup5xEabQzlTR48wWL8Z8gQrBZPbaTo/QxmtRmyfQMK /h9bQIL2X4e42usjPKT+iFT9Aw8IBbet3ECDrAXsyUKZUFnebQ495QprT3m1fLwmhYrB I9W6+TvCd4Mj6otdQYpkyAN65Bs2gPQtCMS6XtBrmFDQJd7lPHd14XulYPKW54CcjlTZ oUjA== X-Gm-Message-State: AOJu0YxR9snAo0WqbmyMcwuyauABpwocjwYk86Xm1P4mvQBKDIrYggRK BUnPiW6bcA+TRdLKge8iL2NZ+wXPn+jcbWSUudYTbZEODxMoP670o7qg8jfhKzYGsB4= X-Gm-Gg: AZuq6aK6yfuRCkgYOU02HHXp/8QGrBXFQ/2SY1Sslvl1p4NiQc8Y0bKHspuKRNjWoZk PENVMyc872KBuUNNKkFMOn2W/2ghxcPaL5eW6k/Li2ICK8Om7ywkjJSn6hz8Ss9I9+IPM0Z8pU+ ESbJRrhspQZ3DkdHYXOBv588GB/XMIz61KtdVBq+JlvkMG3qjXw73xLNnw/UUtMAW+aHgUEcG6b R3LGasLQcbw8T87b1xN9jhC4OOIjkeNxHE9Xjt77yUiIbfY8i07xlxKxcdBozt71+11fF790q21 VI1gUj9PBCdU+R9kIwnvaSqVfeWeAt0IhRTIjJlHiS484poulX9cZQfbWzhZAFUOyop4gYriHwg gvrjoAJieYGEI0v4aFOv4pMN9j/l+Sr1pZU6Wj5+0jawHZtDX33eez5jDdJkSY6AJ9nQAygNlw4 Q1Kn4xtR+hXZAB51oGU5MBrZqN50ztp/ScE/JPIrgj X-Received: by 2002:a17:902:c949:b0:298:616a:ba93 with SMTP id d9443c01a7336-2a84523fa9fmr27665945ad.9.1769401330672; Sun, 25 Jan 2026 20:22:10 -0800 (PST) Received: from fric.. ([210.73.43.101]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fdd0c9sm78875965ad.95.2026.01.25.20.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 20:22:10 -0800 (PST) From: Jiakai Xu X-Google-Original-From: Jiakai Xu To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org, kvm@vger.kernel.org Cc: Alexandre Ghiti , Albert Ou , Palmer Dabbelt , Paul Walmsley , Atish Patra , Anup Patel , Jiakai Xu , Jiakai Xu Subject: [PATCH v2] RISC-V: KVM: Validate SBI STA shmem alignment in kvm_sbi_ext_sta_set_reg Date: Mon, 26 Jan 2026 04:22:01 +0000 Message-Id: <20260126042201.2804148-1-xujiakai2025@iscas.ac.cn> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The RISC-V SBI Steal-Time Accounting (STA) extension requires the shared memory physical address to be 64-byte aligned, and the shared memory size to be at least 64 bytes. KVM exposes the SBI STA shared memory configuration to userspace via KVM_SET_ONE_REG. However, the current implementation of kvm_sbi_ext_sta_set_reg() does not validate the alignment of the configured shared memory address. As a result, userspace can install a misaligned shared memory address that violates the SBI specification. Such an invalid configuration may later reach runtime code paths that assume a valid and properly aligned shared memory region. In particular, KVM_RUN can trigger the following WARN_ON in kvm_riscv_vcpu_record_steal_time(): WARNING: arch/riscv/kvm/vcpu_sbi_sta.c:49 at kvm_riscv_vcpu_record_steal_time WARN_ON paths are not expected to be reachable during normal runtime execution, and may result in a kernel panic when panic_on_warn is enabled. Fix this by validating the shared memory alignment at the KVM_SET_ONE_REG boundary and rejecting misaligned configurations with -EINVAL. The validation is performed on a temporary computed address and only committed to vcpu->arch.sta.shmem once it is known to be valid,=20 similar to the existing logic in kvm_sbi_sta_steal_time_set_shmem() and kvm_sbi_ext_sta_handler(). With this change, invalid userspace state is rejected early and cannot reach runtime code paths that rely on the SBI specification invariants. A reproducer triggering the WARN_ON and the complete kernel log are available at: https://github.com/j1akai/temp/tree/main/20260124 Fixes: f61ce890b1f074 ("RISC-V: KVM: Add support for SBI STA registers") Signed-off-by: Jiakai Xu Signed-off-by: Jiakai Xu --- V1 -> V2: Added Fixes tag. arch/riscv/kvm/vcpu_sbi_sta.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/riscv/kvm/vcpu_sbi_sta.c b/arch/riscv/kvm/vcpu_sbi_sta.c index afa0545c3bcfc..7dfe671c42eaa 100644 --- a/arch/riscv/kvm/vcpu_sbi_sta.c +++ b/arch/riscv/kvm/vcpu_sbi_sta.c @@ -186,23 +186,25 @@ static int kvm_sbi_ext_sta_set_reg(struct kvm_vcpu *v= cpu, unsigned long reg_num, return -EINVAL; value =3D *(const unsigned long *)reg_val; =20 + gpa_t new_shmem =3D vcpu->arch.sta.shmem; + switch (reg_num) { case KVM_REG_RISCV_SBI_STA_REG(shmem_lo): if (IS_ENABLED(CONFIG_32BIT)) { gpa_t hi =3D upper_32_bits(vcpu->arch.sta.shmem); =20 - vcpu->arch.sta.shmem =3D value; - vcpu->arch.sta.shmem |=3D hi << 32; + new_shmem =3D value; + new_shmem |=3D hi << 32; } else { - vcpu->arch.sta.shmem =3D value; + new_shmem =3D value; } break; case KVM_REG_RISCV_SBI_STA_REG(shmem_hi): if (IS_ENABLED(CONFIG_32BIT)) { gpa_t lo =3D lower_32_bits(vcpu->arch.sta.shmem); =20 - vcpu->arch.sta.shmem =3D ((gpa_t)value << 32); - vcpu->arch.sta.shmem |=3D lo; + new_shmem =3D ((gpa_t)value << 32); + new_shmem |=3D lo; } else if (value !=3D 0) { return -EINVAL; } @@ -210,7 +212,10 @@ static int kvm_sbi_ext_sta_set_reg(struct kvm_vcpu *vc= pu, unsigned long reg_num, default: return -ENOENT; } + if (new_shmem && !IS_ALIGNED(new_shmem, 64)) + return -EINVAL; =20 + vcpu->arch.sta.shmem =3D new_shmem; return 0; } =20 --=20 2.34.1