Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4250674pxb; Mon, 8 Feb 2021 11:29:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/i3dqsa1YFBp32bEOhAOxodJavG4cefCWIiHngToqbBGtUht1OD1t4AkyU/bu9RtPCAXA X-Received: by 2002:a05:6402:1ac2:: with SMTP id ba2mr16335930edb.81.1612812547247; Mon, 08 Feb 2021 11:29:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612812547; cv=none; d=google.com; s=arc-20160816; b=zXZ/UpPjJjGUaQ5M1K8W2MC38Wsl5AqRP1TPtlvu8wu351m5OFBlrXZkH+Ha2T0ikY XzEjAEtXSrYLS7Nxs8DgiLapuMuFoRa0PypTIsT18q2ZmE02xsxOhqoC0unbpGNhYXGD cWpiCeH0PGa5PXZFrUmr8FwJ0WtfQDK3PzQzCqCi3UdDurrBSFRyesVoKXGKgMDmplJ2 KkXLyS8B6idajAOx6kF3tNj6YRx8yUeUR1Pcb9exe8T1mVDBqVYYGvN/dPoHCRdAWioV HP7MTO6MzEw1za8l/17e7GSEnK5Hq1yP6Uj/Ck0pX1/+WivSybZfS1qLIroGwKYO+D1q /yOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EMxHmAfCOml9QQ7v1XLdbbMvRu5c0N8igJALrwzthLI=; b=OKzVf9Bk+T9yX4zklGSdHvRptROab21EvmSOpara1NZZUiqyOf5UZFrZBI3S0Bo9uE 5/A0rcj0nXZf8X0fFARzbBOd/miT+RVvQ1b+mGLos5RimcZ0ryT2urZG1EITqAZsUKXN LnMw80YvyTjKlVvBtlT+AReutOSEGXnyNDRwqE28zmpG48kk+LrdXvJ907Xh//WCYvXT nIvCZ9rfe37kOGFLvSvD1qTzs2Y0xu8XvO/4hs8+XDyhJSXwE9OO7nRIfg2V3jSzd8ng H8z/IckBEiZZcUObk/Ja01m+tHzt4elfY3ifS+zcRpsPgz7V6aOAMCEXCHGJrnnj+1MM 8Oaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iPuvdzXP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id du8si11301921ejc.659.2021.02.08.11.28.44; Mon, 08 Feb 2021 11:29:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iPuvdzXP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236265AbhBHT15 (ORCPT + 99 others); Mon, 8 Feb 2021 14:27:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:47962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235096AbhBHSC2 (ORCPT ); Mon, 8 Feb 2021 13:02:28 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 66D7664ED7; Mon, 8 Feb 2021 17:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612807134; bh=FydyvUabgfSj0tpi0vAQQgW4003YdZy9X1JeOpqxO58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iPuvdzXP2Vn5XNTW4YPEjBZ+Gw/1yMSjOqVY/Wok9wBodGCFW60EHz/4qN0G7Be4A kjcYbnIzdq9OpGUaiGUR8hZiXUGyrbni24YjNH0IKuSaceqj1XEDnTOF2LY7/rjV7s hS+JdRz5Ms2rEklJdHlldX7r3l5y3Gfj5wWX3LpBn2smpfl17OIY/RSPX+IbRI6TLR VgmZTXzP5zyAW2DOc1vk85ds/hT/Rx87JvMigQ0gRdwuMKEh4IoMLCpmuw2EHqq3R7 2/P6MEivyVZsa0xWpjh241o/ZmcLUI1n/L4mtOLasR+3aosyDPVCddtwtBpIQc68DS eaDNEwK5eD3Ew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Chancellor , Kees Cook , Nick Desaulniers , Andrew Morton , Linus Torvalds , Sasha Levin , clang-built-linux@googlegroups.com Subject: [PATCH AUTOSEL 5.10 34/36] ubsan: implement __ubsan_handle_alignment_assumption Date: Mon, 8 Feb 2021 12:58:04 -0500 Message-Id: <20210208175806.2091668-34-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210208175806.2091668-1-sashal@kernel.org> References: <20210208175806.2091668-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Chancellor [ Upstream commit 28abcc963149e06d956d95a18a85f4ba26af746f ] When building ARCH=mips 32r2el_defconfig with CONFIG_UBSAN_ALIGNMENT: ld.lld: error: undefined symbol: __ubsan_handle_alignment_assumption referenced by slab.h:557 (include/linux/slab.h:557) main.o:(do_initcalls) in archive init/built-in.a referenced by slab.h:448 (include/linux/slab.h:448) do_mounts_rd.o:(rd_load_image) in archive init/built-in.a referenced by slab.h:448 (include/linux/slab.h:448) do_mounts_rd.o:(identify_ramdisk_image) in archive init/built-in.a referenced 1579 more times Implement this for the kernel based on LLVM's handleAlignmentAssumptionImpl because the kernel is not linked against the compiler runtime. Link: https://github.com/ClangBuiltLinux/linux/issues/1245 Link: https://github.com/llvm/llvm-project/blob/llvmorg-11.0.1/compiler-rt/lib/ubsan/ubsan_handlers.cpp#L151-L190 Link: https://lkml.kernel.org/r/20210127224451.2587372-1-nathan@kernel.org Signed-off-by: Nathan Chancellor Acked-by: Kees Cook Reviewed-by: Nick Desaulniers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- lib/ubsan.c | 31 +++++++++++++++++++++++++++++++ lib/ubsan.h | 6 ++++++ 2 files changed, 37 insertions(+) diff --git a/lib/ubsan.c b/lib/ubsan.c index cb9af3f6b77e3..adf8dcf3c84e6 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -427,3 +427,34 @@ void __ubsan_handle_load_invalid_value(void *_data, void *val) ubsan_epilogue(); } EXPORT_SYMBOL(__ubsan_handle_load_invalid_value); + +void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr, + unsigned long align, + unsigned long offset); +void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr, + unsigned long align, + unsigned long offset) +{ + struct alignment_assumption_data *data = _data; + unsigned long real_ptr; + + if (suppress_report(&data->location)) + return; + + ubsan_prologue(&data->location, "alignment-assumption"); + + if (offset) + pr_err("assumption of %lu byte alignment (with offset of %lu byte) for pointer of type %s failed", + align, offset, data->type->type_name); + else + pr_err("assumption of %lu byte alignment for pointer of type %s failed", + align, data->type->type_name); + + real_ptr = ptr - offset; + pr_err("%saddress is %lu aligned, misalignment offset is %lu bytes", + offset ? "offset " : "", BIT(real_ptr ? __ffs(real_ptr) : 0), + real_ptr & (align - 1)); + + ubsan_epilogue(); +} +EXPORT_SYMBOL(__ubsan_handle_alignment_assumption); diff --git a/lib/ubsan.h b/lib/ubsan.h index 7b56c09473a98..9a0b71c5ff9fb 100644 --- a/lib/ubsan.h +++ b/lib/ubsan.h @@ -78,6 +78,12 @@ struct invalid_value_data { struct type_descriptor *type; }; +struct alignment_assumption_data { + struct source_location location; + struct source_location assumption_location; + struct type_descriptor *type; +}; + #if defined(CONFIG_ARCH_SUPPORTS_INT128) typedef __int128 s_max; typedef unsigned __int128 u_max; -- 2.27.0