mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-04-17 08:54:52 +03:00
Linux: work around use of GPL-only symbol kasan_flag_enabled
We may not be able to avoid our code referencing the symbol, but we can ensure that a symbol of that name is available to the linker during build, and so not require linking the GPL-exported version. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <robn@despairlabs.com> Closes #18009 Closes #18040
This commit is contained in:
parent
028d66b9dd
commit
c9845a1332
23
config/kernel-kasan-enabled.m4
Normal file
23
config/kernel-kasan-enabled.m4
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
dnl #
|
||||||
|
dnl # 6.18: some architectures and config option causes the kasan_ inline
|
||||||
|
dnl # functions to reference the GPL-only symbol 'kasan_flag_enabled',
|
||||||
|
dnl # breaking the build. Detect this and work
|
||||||
|
dnl # around it.
|
||||||
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_KASAN_ENABLED], [
|
||||||
|
ZFS_LINUX_TEST_SRC([kasan_enabled], [
|
||||||
|
#include <linux/kasan.h>
|
||||||
|
], [
|
||||||
|
kasan_enabled();
|
||||||
|
], [], [ZFS_META_LICENSE])
|
||||||
|
])
|
||||||
|
AC_DEFUN([ZFS_AC_KERNEL_KASAN_ENABLED], [
|
||||||
|
AC_MSG_CHECKING([whether kasan_enabled() is GPL-only])
|
||||||
|
ZFS_LINUX_TEST_RESULT([kasan_enabled_license], [
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
], [
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE(HAVE_KASAN_ENABLED_GPL_ONLY, 1,
|
||||||
|
[kasan_enabled() is GPL-only])
|
||||||
|
])
|
||||||
|
])
|
||||||
|
|
||||||
@ -138,6 +138,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
|
|||||||
ZFS_AC_KERNEL_SRC_SOPS_FREE_INODE
|
ZFS_AC_KERNEL_SRC_SOPS_FREE_INODE
|
||||||
ZFS_AC_KERNEL_SRC_NAMESPACE
|
ZFS_AC_KERNEL_SRC_NAMESPACE
|
||||||
ZFS_AC_KERNEL_SRC_INODE_GENERIC_DROP
|
ZFS_AC_KERNEL_SRC_INODE_GENERIC_DROP
|
||||||
|
ZFS_AC_KERNEL_SRC_KASAN_ENABLED
|
||||||
case "$host_cpu" in
|
case "$host_cpu" in
|
||||||
powerpc*)
|
powerpc*)
|
||||||
ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE
|
ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE
|
||||||
@ -260,6 +261,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
|
|||||||
ZFS_AC_KERNEL_SOPS_FREE_INODE
|
ZFS_AC_KERNEL_SOPS_FREE_INODE
|
||||||
ZFS_AC_KERNEL_NAMESPACE
|
ZFS_AC_KERNEL_NAMESPACE
|
||||||
ZFS_AC_KERNEL_INODE_GENERIC_DROP
|
ZFS_AC_KERNEL_INODE_GENERIC_DROP
|
||||||
|
ZFS_AC_KERNEL_KASAN_ENABLED
|
||||||
case "$host_cpu" in
|
case "$host_cpu" in
|
||||||
powerpc*)
|
powerpc*)
|
||||||
ZFS_AC_KERNEL_CPU_HAS_FEATURE
|
ZFS_AC_KERNEL_CPU_HAS_FEATURE
|
||||||
|
|||||||
@ -433,6 +433,7 @@ ZFS_OBJS := \
|
|||||||
ZFS_OBJS_OS := \
|
ZFS_OBJS_OS := \
|
||||||
abd_os.o \
|
abd_os.o \
|
||||||
arc_os.o \
|
arc_os.o \
|
||||||
|
kasan_compat.o \
|
||||||
mmp_os.o \
|
mmp_os.o \
|
||||||
policy.o \
|
policy.o \
|
||||||
qat.o \
|
qat.o \
|
||||||
|
|||||||
48
module/os/linux/zfs/kasan_compat.c
Normal file
48
module/os/linux/zfs/kasan_compat.c
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
// SPDX-License-Identifier: CDDL-1.0
|
||||||
|
/*
|
||||||
|
* CDDL HEADER START
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the terms of the
|
||||||
|
* Common Development and Distribution License (the "License").
|
||||||
|
* You may not use this file except in compliance with the License.
|
||||||
|
*
|
||||||
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||||
|
* or https://opensource.org/licenses/CDDL-1.0.
|
||||||
|
* See the License for the specific language governing permissions
|
||||||
|
* and limitations under the License.
|
||||||
|
*
|
||||||
|
* When distributing Covered Code, include this CDDL HEADER in each
|
||||||
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||||
|
* If applicable, add the following below this CDDL HEADER, with the
|
||||||
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||||
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||||
|
*
|
||||||
|
* CDDL HEADER END
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2025, Rob Norris <robn@despairlabs.com>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _ZFS_LINUX_KASAN_ENABLED_H
|
||||||
|
#define _ZFS_LINUX_KASAN_ENABLED_H
|
||||||
|
|
||||||
|
#ifdef HAVE_KASAN_ENABLED_GPL_ONLY
|
||||||
|
/*
|
||||||
|
* The kernel supports a runtime setting to enable/disable KASAN. The control
|
||||||
|
* flag kasan_flag_enabled is a GPL-only symbol, which prevents us from
|
||||||
|
* accessing it. Unfortunately, this is called by the header function
|
||||||
|
* kasan_enabled(), which in turn is used to call or skip instrumentation
|
||||||
|
* functions in various header-based kernel facilities. If we inadvertently
|
||||||
|
* call one, the build breaks.
|
||||||
|
*
|
||||||
|
* To work around this, we define our own `kasan_flag_enabled` set to "false",
|
||||||
|
* disabling use of KASAN inside our code. The linker will resolve this symbol
|
||||||
|
* at build time, and so never need to reach out to the off-limits kernel
|
||||||
|
* symbol.
|
||||||
|
*/
|
||||||
|
#include <linux/static_key.h>
|
||||||
|
struct static_key_false kasan_flag_enabled = STATIC_KEY_FALSE_INIT;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -31,7 +31,6 @@
|
|||||||
/* Portions Copyright 2007 Jeremy Teo */
|
/* Portions Copyright 2007 Jeremy Teo */
|
||||||
/* Portions Copyright 2010 Robert Milkowski */
|
/* Portions Copyright 2010 Robert Milkowski */
|
||||||
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user