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 D01B0265CA2 for ; Wed, 30 Apr 2025 16:27:33 +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=1746030455; cv=none; b=k/KD2v+r2AQ2vbmRHfVuLEZqjd5xXglkpdQQmmS5JoIgprBl5Hv7M6zH9HD7mlawcme/DZ7f8mIOxVyhN0bCFZKYUWv76du0TuttoB+UF+graeEOG23RHz81hQWb7TBlcypMKulvak8GS3RnG5Vp73tvkBQ0aX6N65pKFr3aAZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746030455; c=relaxed/simple; bh=64gtqcGZ8wcy6/ozndo3lRwaVc9zcMKebNzxQK1wlWk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Z8dnQ3IZEr26Z9ylIgJ+J6vAdl6ktav+pqJdRqtKsme2TFS5XxCzPW8e+n05oydAi/3rFUEAiMRLFN/zfWZSKB7LvqHfeHTOtkUPUl4zhVRX+6JMpMYDmzfyAONTZPNCYpN4VFc9hx2yvp0nkIVw9uRs0416PnZcpbeCJ+kDpuA= 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=y3nBgKPJ; 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="y3nBgKPJ" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cf5196c25so12255e9.0 for ; Wed, 30 Apr 2025 09:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746030452; x=1746635252; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZqTf0w984hWi5llfvtlyawmZ56xQei2ohDzGa9Ujg2A=; b=y3nBgKPJhRIKLEh3t0hfUcliA8mfBdv9LEUtXQIWRhRfnBY5EHHNmTYXkYWSFjtxoU QQS4PYNUlVOQShV9s74e26kg01m0b7hUqKYJzySyL7+oce23Rpzg/ObOuIJzHAO5zUwP TnD3GuyDLwSSTUq5zeldd/Kgp2yRFCLxPC59XAg5cTxjdjxQdS07NhJAdJVisZyg9rol NYSGBqfomHCb8DiGQ5BqIrrMYYQ5UY78izesZlMFLr4NTuTcXU38jQ33V9XcvJuLZiG3 XzDA1M3UN5G0CV3j7cg11K+LhUT5CtsvhrDeYrD5y0hHEibI1DY93cKzL6mVk+MiNMjl ufYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746030452; x=1746635252; 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=ZqTf0w984hWi5llfvtlyawmZ56xQei2ohDzGa9Ujg2A=; b=EwE2koxZZd1Zls030zGtvUcBU3RxuKBzDbryf5Q2kcfAi6w78WrCq6mgKNSsgoTKPM KwkmG60xH2Yig0PQVo7htFUf3rbiJ2FDkN7Krsrl0t/uGG9AOOBM8UZ88/N+sQASJ2JT 00vixpHUrGYaAp5q3WNfvDKNu/rNPhSYpfdJkIZzMvl2T42wb9jcuvRJNOo4XSUTc3WS DlQ0O++XZwo053tgNEZ9dUutO6y/LV4tGQlP2b0Itl0p+BWzubXVz1m83hc9wfHc5pae qy1B3+d8ZEU2thpA6lTUv9qw3ewuEBGwHfXivdJXkPsUZL/kWtgyiqGST8YOvSE1Nf/F B/mw== X-Forwarded-Encrypted: i=1; AJvYcCVN7KqcmIdaTf5dSlJfSWCk6oSVy3prtLnrk6T2QcVOKYdbPFxsV9qNxaFXqtQKhKGVS5jduzm/xM4obb9HyqU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9/AcMjzeHN1TYX84lLqajzpBNw8H/QNylP35Ieo9wEtq5xrSD o0lGnQm1hu6xHrcR7aw5o9l6lmgLVrzAUbF/Jh86swbZ8yNMSRQ71BJsB0vvNAH/VHiLnN37PRP RZWud73jWPA== X-Google-Smtp-Source: AGHT+IElx2K4Ydzexiq6oj60bHV5vV1dfYGpgIOCHldmU1tuiZbYiGFH3YyV8uq6opoqtz/pcuka5AJ5zvQ7LQ== X-Received: from wrp29.prod.google.com ([2002:a05:6000:41fd:b0:399:71d8:5e84]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5f4e:0:b0:3a0:8712:5983 with SMTP id ffacd0b85a97d-3a08f7d1a1bmr3354676f8f.51.1746030452526; Wed, 30 Apr 2025 09:27:32 -0700 (PDT) Date: Wed, 30 Apr 2025 16:27:11 +0000 In-Reply-To: <20250430162713.1997569-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250430162713.1997569-1-smostafa@google.com> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog Message-ID: <20250430162713.1997569-5-smostafa@google.com> Subject: [PATCH v2 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.967.g6a0df3ecc3-goog