From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 0BFD2221556 for ; Wed, 16 Apr 2025 18:05:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826729; cv=none; b=SqSwG4cMg80GfDfCO6nddiOuXERkzn7TiKbPa5Xe+fvaxmdMFBlDgpUpu6Jmpqh873gSIa5hoUQlKSvkaO2WE79h1gs6TTx63U2d+BLy4wqitW3bGQMcV6qIQvUfN2UPxXCdFSLIj1QfdbpQ4ATy/yHn6z40GQu32m0q17+FmS0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826729; c=relaxed/simple; bh=YF46acwvxQZbvh+RKbVxSqYbt3n7AeN8CBy/samnYi8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MOI1pMvisIjrpTpReeFhUUAzuVRt23MqRb8fOC6PHKYbMTMRAviNI15bDZgodm5ta0m75RkdKBWEoII8UTThUFu0pS7tTM8cCl8+kNocYzPvgDgdSI7GUgHtLPrQ1qgD2zj87VdhvIZ+jmp4jv6OUQ3/mELT10vWXrVFqoDmssg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=I89hK8s+; arc=none smtp.client-ip=209.85.128.73 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--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="I89hK8s+" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43d22c304adso4551675e9.0 for ; Wed, 16 Apr 2025 11:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744826726; x=1745431526; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xO8p3wWnMTFzkHmEwWDOeYMg/xjqFsfP9HNTtGIh/qY=; b=I89hK8s+fWzpVoArGXj6LrR804huFCB8+sns8yTDfRa7Nr2I7C9b4vGWspdqVcQfqG bZYx0oGQ5iFvXf+e34GP6jPaq7tlZtH5rmb5okfdH5cqXm9+BZpt6Vv7wkiO6mWaLiO8 KRlZfGsz2NCfaXMi/RYb+luG7YD7NBxW6v5acNiJlBA79rRH9SFaZxujftd+TAh/Kqcb oCm0Bn4DC4gQ8ejes+oPse+64q1RCDVexePyJjnXHEH+WuGqQ+VT+ug3PGcIx5emdLPB t6CL1QBPUUHiNOrHrSM3dkp4ua6pt1b4PDSNXAdHooc1tCBYzygJKm/eELrJU3EOC86m rnnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744826726; x=1745431526; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xO8p3wWnMTFzkHmEwWDOeYMg/xjqFsfP9HNTtGIh/qY=; b=nX0niiYD4BYWcH6gUx3DlFR+fwsZjiRDTlPNbUfvIHeBiSGIrfwFkOkU8YO/qydYld RZoUXwwxFsvLufGun0/i2kOR3B+5uBk40VvMxBgNsr9PtxjpwV6Cau9aHy9K2nn2i6q5 NQQmNCusj1OVFoOFDKtpSWh2dBlryp6+SnjWGdG74Sv9H8Hnpff2D9wAiRD9FaNngjZV O1n9ljihnI5bJ8qwpK2SoTH7Tz9JRXg679zllaJA601hJlFEkUIEWIptkKxSOAyZhxtm 2MOXe+6MyLNIj2FfsSIQ6wGyTN6hLVgD97b7Gl8G2UBaKzZmfZn1J1Wpi/jhQ+NLpRhC WTHQ== X-Gm-Message-State: AOJu0Yz6ky1q3mpIOU79r1s6EDqCJdLfZvWAUf4bTGe45ZxZz97yMsdK i+Z4sWZ6dxcoFP2MRSMzzCO1gNy7hN/9WYrgcZwmK5aScxld2gaftIYSUDO1mr6IGf10zBIFptJ oErIytJoRxaW0u21uctO/ZAjp2hWyO9R069tj6YJpG0kGW6+idSKp6dPfGai925GdEgUE/CaWQu NypmRYhdoYLNv9RUr6LP612B6LuGMnIfd6MB/+JDwtImA= X-Google-Smtp-Source: AGHT+IFu4srZxpATOjlO2rI6vko1n4XKZtERHwJbfnOezh1jE9LHVVBUHBqm8Y3anm1ST1HCKXtYf3N4xz9VaA== X-Received: from wmbh25.prod.google.com ([2002:a05:600c:a119:b0:43d:586a:9bcb]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a4b:b0:43b:4829:8067 with SMTP id 5b1f17b1804b1-44062421bd7mr3209925e9.6.1744826726256; Wed, 16 Apr 2025 11:05:26 -0700 (PDT) Date: Wed, 16 Apr 2025 18:04:34 +0000 In-Reply-To: <20250416180440.231949-1-smostafa@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250416180440.231949-1-smostafa@google.com> X-Mailer: git-send-email 2.49.0.777.g153de2bbd5-goog Message-ID: <20250416180440.231949-5-smostafa@google.com> Subject: [PATCH 4/4] KVM: arm64: Handle UBSAN faults From: Mostafa Saleh To: kvmarm@lists.linux.dev, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, broonie@kernel.org, catalin.marinas@arm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kees@kernel.org, elver@google.com, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, akpm@linux-foundation.org, yuzenghui@huawei.com, suzuki.poulose@arm.com, joey.gouly@arm.com, masahiroy@kernel.org, nathan@kernel.org, nicolas.schier@linux.dev, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" As now UBSAN can be enabled, handle brk64 exits from UBSAN. Re-use the decoding code from the kernel, and panic with UBSAN message. Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/handle_exit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index b73dc26bc44b..5c49540883e3 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -474,6 +475,11 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, print_nvhe_hyp_panic("BUG", panic_addr); } else if (IS_ENABLED(CONFIG_CFI_CLANG) && esr_is_cfi_brk(esr)) { kvm_nvhe_report_cfi_failure(panic_addr); + } else if (IS_ENABLED(CONFIG_UBSAN_KVM_EL2) && + ESR_ELx_EC(esr) == ESR_ELx_EC_BRK64 && + esr_is_ubsan_brk(esr)) { + print_nvhe_hyp_panic(report_ubsan_failure(esr & UBSAN_BRK_MASK), + panic_addr); } else { print_nvhe_hyp_panic("panic", panic_addr); } -- 2.49.0.604.gff1f9ca942-goog