From patchwork Mon Apr 14 21:36:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mostafa Saleh X-Patchwork-Id: 14051152 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 E5C9B1DF98F for ; Mon, 14 Apr 2025 21:37:00 +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=1744666622; cv=none; b=BLRgWebMzDSfzljhOSj0qiJXbfsOi5nAAFkz9A87uLdBGlHkhThGUADtbRoYD/hTqgRk8pj56HPnA5NyQxfDe/tpczaEXr0mifbTDJaGXtcgKZm/D4Bv/sVKb1JvpTXx6Rpv3hDplmXmKfgzHZuWAZBfu9MY8DJBWLZXAi2tt+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744666622; c=relaxed/simple; bh=Tk24utghGkFplP4e4dv7/jYc7nM2GAMqLLXblA4mn+I=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=BtB9YQOMPrJMuzuafYbphi+pIAqoNbG9vIqq83ghSfAmvtInxl51ZyJDkuODb88oyrVTOBvIxc8Cyk65MsI/sTVQuVvgRdFWwTAHb8ngIEYchcK/MSUJuKofBGKorFpphiagqRHcNaHVeWepe6uyH9XwwJCaxsFjHajxvvKwkxk= 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=i7ercoH+; 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="i7ercoH+" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43d00017e9dso30342545e9.0 for ; Mon, 14 Apr 2025 14:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744666619; x=1745271419; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=jF2TNhYRLgqPg2GomnHoMsGcCSNdCtX7kL0R4HVOm0M=; b=i7ercoH+Op01ort4BqMWo9I+4ZPYByFW6+JKc70Iio3f2FWriRQ9VsJFTG0VrRHYd/ Dq4ig4VHvZHR1l/TCuSVP48O5HoACH9grDkREHnxGFeDrLq1ssCN3fDsYSp8VVutY+b4 XC55p27CVIFhM3pIXF6KQGKTP0gia5M+HWPMndIYm9w0KmeJTtJemRThXj2r7UJ1fLFd +xp2Ugv6yr9EZg3AUnYGQiS00ybabs79TRoZB8+/t3vckHvqRVd+C3unZddjIL4T8Gnp sko90YuQ2kzXGst/0W3ilU7YsPa82b/hAIeCAe02Qph/HvGUraxgTtZHpumEmjv3wb7m BwlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744666619; x=1745271419; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jF2TNhYRLgqPg2GomnHoMsGcCSNdCtX7kL0R4HVOm0M=; b=dzwCm+fqGkHtXhkwt3OdMIEQWmfJSIqhnv6dRYjMN3wR1M4ZXqgZPB8inBttKOiQkK Ia4IAHAosNbL/rgHXIuEpn2JYoR/a1dFAX5o1g7XLmyZKjEZD2FldO1wFgh8LoX6Cu7m GeGb2rg+lOB9nmud3539Re4qnJvoYzffa+AwoJ9cd1RigovlYByXG3O66Ex+X7O5Jkvg MxdHA7Yne3iOGhRNOWZ6D0rH7MTNo2jvJ3f48hiiC/KWN+7VM7J9++OYyQNK0yrKz8dr i3jgg52tqeCzQ9gF7ozQKH1MwVkcBaQJMnVuExOAYsB8gmZpoxcFi0xzPAyjCZgY8agd pkEA== X-Forwarded-Encrypted: i=1; AJvYcCWGb98YhKljzihbyMIpU490cASckqn1fd5f4e17QRmrF2/cNTwcVdRRn/rMCzDybMP9EecQLGRkotSb6bB3Pgk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzwea6ZKnE4+wgmHLqbcA6Q/JZ+XCB+6w5lm4f+tJlOQWMDM2zJ f6J2pCIW2rba00n3doWoyp/hRXrG5QKBHOpz0ukvjlQ96JV1SzStv1qvn4cBvySvd0uOUKe2qMO j9LDPTI2PMw== X-Google-Smtp-Source: AGHT+IGt6SdsBhDCC9mxwhOwKurQqfl47SwTpTcZcPKa30UdcdmeRTNfSJw4Tae6aDy5J+4zBAj0NpZLX6MBTw== X-Received: from wmsp9.prod.google.com ([2002:a05:600c:1d89:b0:43d:9595:9973]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a04:b0:43d:42b:e186 with SMTP id 5b1f17b1804b1-43f3a93f257mr98041855e9.8.1744666619418; Mon, 14 Apr 2025 14:36:59 -0700 (PDT) Date: Mon, 14 Apr 2025 21:36:48 +0000 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250414213648.2660150-1-smostafa@google.com> Subject: [PATCH] lib/test_ubsan.c: Fix panic from test_ubsan_out_of_bounds From: Mostafa Saleh To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org Cc: akpm@linux-foundation.org, kees@kernel.org, elver@google.com, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, Mostafa Saleh Running lib_ubsan.ko on arm64 (without CONFIG_UBSAN_TRAP) panics the kernel [ 31.616546] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: test_ubsan_out_of_bounds+0x158/0x158 [test_ubsan] [ 31.646817] CPU: 3 UID: 0 PID: 179 Comm: insmod Not tainted 6.15.0-rc2 #1 PREEMPT [ 31.648153] Hardware name: linux,dummy-virt (DT) [ 31.648970] Call trace: [ 31.649345] show_stack+0x18/0x24 (C) [ 31.650960] dump_stack_lvl+0x40/0x84 [ 31.651559] dump_stack+0x18/0x24 [ 31.652264] panic+0x138/0x3b4 [ 31.652812] __ktime_get_real_seconds+0x0/0x10 [ 31.653540] test_ubsan_load_invalid_value+0x0/0xa8 [test_ubsan] [ 31.654388] init_module+0x24/0xff4 [test_ubsan] [ 31.655077] do_one_initcall+0xd4/0x280 [ 31.655680] do_init_module+0x58/0x2b4 That happens because the test corrupts other data in the stack: 400: d5384108 mrs x8, sp_el0 404: f9426d08 ldr x8, [x8, #1240] 408: f85f83a9 ldur x9, [x29, #-8] 40c: eb09011f cmp x8, x9 410: 54000301 b.ne 470 // b.any As there is no guarantee the compiler will order the local variables as declared in the module: volatile char above[4] = { }; /* Protect surrounding memory. */ volatile int arr[4]; volatile char below[4] = { }; /* Protect surrounding memory. */ So, instead of writing out-of-bound, we can read out-of-bound which still triggers UBSAN but doesn't corrupt the stack. Signed-off-by: Mostafa Saleh --- lib/test_ubsan.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/test_ubsan.c b/lib/test_ubsan.c index 8772e5edaa4f..0e5c18b32b2d 100644 --- a/lib/test_ubsan.c +++ b/lib/test_ubsan.c @@ -77,18 +77,15 @@ static void test_ubsan_shift_out_of_bounds(void) static void test_ubsan_out_of_bounds(void) { - volatile int i = 4, j = 5, k = -1; - volatile char above[4] = { }; /* Protect surrounding memory. */ + volatile int j = 5, k = -1; + volatile int scratch[4] = { }; volatile int arr[4]; - volatile char below[4] = { }; /* Protect surrounding memory. */ - - above[0] = below[0]; UBSAN_TEST(CONFIG_UBSAN_BOUNDS, "above"); - arr[j] = i; + scratch[1] = arr[j]; UBSAN_TEST(CONFIG_UBSAN_BOUNDS, "below"); - arr[k] = i; + scratch[2] = arr[k]; } enum ubsan_test_enum {