From patchwork Wed Mar 31 21:27:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 12176355 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94578C433ED for ; Wed, 31 Mar 2021 21:29:20 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1C6661041 for ; Wed, 31 Mar 2021 21:29:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1C6661041 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version:Message-Id:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=dYV08NEHRFulMr/EAI38VBU/leq6LlFGouE40LcrK+s=; b=Atcaz525PO9jvuXreKW1onvq2X 4TAKDNyqGx4UiYrlWY4oAw4xWY7hqMGChuuvAbRZ2LzkE4GV8UDSHf5Z6MButJHzvkKsOgZVfF3za bq3RaLuuV46mBHjjhPIdSF4DanPg2ZLDn16SAgBkqmBdlUrupR83mgWK+JqdmU6Im2ZDR+ounUFQL vAZRYrNaqF3k4hkRx9//QCHYR5lwXYNXglZm/iAvLC0ag4xdqx7d/ASQs5BzkK2vvIzCGbLw04FPS c1rK/dE94eg4vwu9AM6LPgIBYgHBYvBhwe2gwMJftRujWdpxYuF9VnKvWMVxlz25UkfjV9n6X7XRS A1whGlag==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRiN8-007egF-T0; Wed, 31 Mar 2021 21:27:30 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRiN4-007ef8-Kd for linux-arm-kernel@lists.infradead.org; Wed, 31 Mar 2021 21:27:28 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id v6so3644420ybk.9 for ; Wed, 31 Mar 2021 14:27:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=yTP+LjBFDmYzEkZN/ojSVPqO+bAHNBu2aAmdwQC8Sq0=; b=IImtgBJ7yAhdvPcjObAuget2Jumf3PaCW/76HUIX7raQTGWs3yNE9WoPlH1zK6Q1u4 +7jYJb6uW1OS281+twBaFF73GLAuKSTPkEbScEk2CWC9E+ti1FwiAPHe8Wbe1//KUbjL p+kRmfOunTBE7ZEh3NxO0tHeV4EUi6uiuuwGTA81RWeaZZ2Xjnt/4baMCb8b5+Fu7aso 9/gyF3XK113vGJ96dbjy4rWUJO2LXn66iORt+eQxiaRmhqAP1anwF+wgvtGqNUrXORGu i4cblL+YQtoV/evE8Hf9ig9e6yT+Kxf/odgiUwus7g8QgOHtY6Ewb2hW78AIWe2OImPx Wjgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=yTP+LjBFDmYzEkZN/ojSVPqO+bAHNBu2aAmdwQC8Sq0=; b=Gk3HbzRwme/CMCIIFXjH8DdMd3+zn/92FcQI9TfB447WISoYETTjmkLWhS5SYKG+px 8+F3zAFAxvzvBzCaKknlSa+a+1XBm4Rk6rZrOUQJ5/33CLVjnYRS6oXc1xMmfSEbK2yg SSVczwm2H3y2Lgw/wuW9N5xldTGL3e7Lu8NWtdwOnnOt/ZFRuyFmJvtihl2SCtAjrHtH cveHbKzhwl6H0KXUP3JvfdyNDRdrzyHbuyWxSPjql4Zdou+Pi4wIGkbLX2c+XmPcdBmi lvEt1z2NPozWd+TxNhnsa0ago1pw1mqX5B8CVd8ilKO4RBgZK4DGi30CULqHyBOGH+vA 3UHA== X-Gm-Message-State: AOAM5309axe5qHj5c83t+hmZIWdCbu/rFnc2JW1hk6PU2gwL+Af75erJ KdMIwKQtkrSWHdabZYGpohMiUvrlBb/TPq3FMyU= X-Google-Smtp-Source: ABdhPJxEEWvfo80m5ShoYqPvblwqvUS4wssFRgdGlX1k6EZR1yPZFQwGxomYdq2wD1SGfu2YEhzp2R2AwbgiIYN6I9g= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:7933:7015:a5d5:3835]) (user=samitolvanen job=sendgmr) by 2002:a25:2386:: with SMTP id j128mr7405063ybj.284.1617226044066; Wed, 31 Mar 2021 14:27:24 -0700 (PDT) Date: Wed, 31 Mar 2021 14:27:04 -0700 Message-Id: <20210331212722.2746212-1-samitolvanen@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH v4 00/17] Add support for Clang CFI From: Sami Tolvanen To: Kees Cook Cc: Nathan Chancellor , Nick Desaulniers , Masahiro Yamada , Will Deacon , Jessica Yu , Arnd Bergmann , Tejun Heo , "Paul E. McKenney" , Christoph Hellwig , Peter Zijlstra , Sedat Dilek , bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210331_222726_786433_ABAE4111 X-CRM114-Status: GOOD ( 19.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This series adds support for Clang's Control-Flow Integrity (CFI) checking. With CFI, the compiler injects a runtime check before each indirect function call to ensure the target is a valid function with the correct static type. This restricts possible call targets and makes it more difficult for an attacker to exploit bugs that allow the modification of stored function pointers. For more details, see: https://clang.llvm.org/docs/ControlFlowIntegrity.html The first patch contains build system changes and error handling, and implements support for cross-module indirect call checking. The remaining patches address issues caused by the compiler instrumentation. These include fixing known type mismatches, as well as issues with address space confusion and cross-module function address equality. These patches add support only for arm64, but I'll post patches also for x86_64 after we address the remaining issues there, including objtool support. You can also pull this series from https://github.com/samitolvanen/linux.git cfi-v4 --- Changes in v4: - Per Mark's suggestion, dropped __pa_function() and renamed __va_function() to function_nocfi(). - Added a comment to function_nocfi() to explain what it does. - Updated the psci patch to use an intermediate variable for the physical address for clarity. Changes in v3: - Added a patch to change list_sort() callers treewide to use const pointers instead of simply removing the internal casts. - Changed cleanup_symbol_name() to return bool. - Changed module.lds.S to drop the .eh_frame section only with CONFIG_CFI_CLANG. - Switched to synchronize_rcu() in update_shadow(). Changes in v2: - Fixed .text merging in module.lds.S. - Added WARN_ON_FUNCTION_MISMATCH() and changed kernel/thread.c and kernel/workqueue.c to use the macro instead. Sami Tolvanen (17): add support for Clang CFI cfi: add __cficanonical mm: add generic function_nocfi macro module: ensure __cfi_check alignment workqueue: use WARN_ON_FUNCTION_MISMATCH kthread: use WARN_ON_FUNCTION_MISMATCH kallsyms: strip ThinLTO hashes from static functions bpf: disable CFI in dispatcher functions treewide: Change list_sort to use const pointers lkdtm: use function_nocfi psci: use function_nocfi for cpu_resume arm64: implement function_nocfi arm64: use function_nocfi with __pa_symbol arm64: add __nocfi to functions that jump to a physical address arm64: add __nocfi to __apply_alternatives KVM: arm64: Disable CFI for nVHE arm64: allow CONFIG_CFI_CLANG to be selected Makefile | 17 + arch/Kconfig | 45 +++ arch/arm64/Kconfig | 1 + arch/arm64/include/asm/memory.h | 15 + arch/arm64/include/asm/mmu_context.h | 4 +- arch/arm64/kernel/acpi_parking_protocol.c | 3 +- arch/arm64/kernel/alternative.c | 4 +- arch/arm64/kernel/cpu-reset.h | 10 +- arch/arm64/kernel/cpufeature.c | 4 +- arch/arm64/kernel/psci.c | 3 +- arch/arm64/kernel/smp_spin_table.c | 3 +- arch/arm64/kvm/hyp/nvhe/Makefile | 6 +- arch/arm64/kvm/vgic/vgic-its.c | 8 +- arch/arm64/kvm/vgic/vgic.c | 3 +- block/blk-mq-sched.c | 3 +- block/blk-mq.c | 3 +- drivers/acpi/nfit/core.c | 3 +- drivers/acpi/numa/hmat.c | 3 +- drivers/clk/keystone/sci-clk.c | 4 +- drivers/firmware/psci/psci.c | 7 +- drivers/gpu/drm/drm_modes.c | 3 +- drivers/gpu/drm/i915/gt/intel_engine_user.c | 3 +- drivers/gpu/drm/i915/gvt/debugfs.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +- drivers/gpu/drm/radeon/radeon_cs.c | 4 +- .../hw/usnic/usnic_uiom_interval_tree.c | 3 +- drivers/interconnect/qcom/bcm-voter.c | 2 +- drivers/md/raid5.c | 3 +- drivers/misc/lkdtm/usercopy.c | 2 +- drivers/misc/sram.c | 4 +- drivers/nvme/host/core.c | 3 +- .../controller/cadence/pcie-cadence-host.c | 3 +- drivers/spi/spi-loopback-test.c | 3 +- fs/btrfs/raid56.c | 3 +- fs/btrfs/tree-log.c | 3 +- fs/btrfs/volumes.c | 3 +- fs/ext4/fsmap.c | 4 +- fs/gfs2/glock.c | 3 +- fs/gfs2/log.c | 2 +- fs/gfs2/lops.c | 3 +- fs/iomap/buffered-io.c | 3 +- fs/ubifs/gc.c | 7 +- fs/ubifs/replay.c | 4 +- fs/xfs/scrub/bitmap.c | 4 +- fs/xfs/xfs_bmap_item.c | 4 +- fs/xfs/xfs_buf.c | 6 +- fs/xfs/xfs_extent_busy.c | 4 +- fs/xfs/xfs_extent_busy.h | 3 +- fs/xfs/xfs_extfree_item.c | 4 +- fs/xfs/xfs_refcount_item.c | 4 +- fs/xfs/xfs_rmap_item.c | 4 +- include/asm-generic/bug.h | 16 + include/asm-generic/vmlinux.lds.h | 20 +- include/linux/bpf.h | 4 +- include/linux/cfi.h | 41 +++ include/linux/compiler-clang.h | 3 + include/linux/compiler_types.h | 8 + include/linux/init.h | 6 +- include/linux/list_sort.h | 7 +- include/linux/mm.h | 10 + include/linux/module.h | 13 +- include/linux/pci.h | 4 +- init/Kconfig | 2 +- kernel/Makefile | 4 + kernel/cfi.c | 329 ++++++++++++++++++ kernel/kallsyms.c | 55 ++- kernel/kthread.c | 3 +- kernel/module.c | 43 +++ kernel/workqueue.c | 2 +- lib/list_sort.c | 17 +- lib/test_list_sort.c | 3 +- net/tipc/name_table.c | 4 +- scripts/Makefile.modfinal | 2 +- scripts/module.lds.S | 20 +- 74 files changed, 759 insertions(+), 112 deletions(-) create mode 100644 include/linux/cfi.h create mode 100644 kernel/cfi.c base-commit: d19cc4bfbff1ae72c3505a00fb8ce0d3fa519e6c