Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1010209pxf; Thu, 25 Mar 2021 21:38:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQjOBhbKwjXNBZpfCSe6cHyqOPbWzoquRMSjwSSGQQaEWtZlE1j9ER9FggLcb2U5wQk7/g X-Received: by 2002:a50:fa92:: with SMTP id w18mr12662598edr.172.1616733515867; Thu, 25 Mar 2021 21:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616733515; cv=none; d=google.com; s=arc-20160816; b=OlPYr/ZHOcuma/yjJa2gcFN1iZ6yhXWadTszqg80m2MNACNYQpXrb89SZumg2i/l+7 d/3UWR8CWSFgNjsqiN9GfOtzoromVXLj1M1o36fOsVEoFfA4n7pJ/pTVs/Onrebh3RVx WzzaThADJngcTd0dzOku3Ji7ywMiBmmuT4JsQJpn01IbaRbEEmHPSrSYS/fW8+K3EVcZ JGdDF59B1NNnAv6cxKM8C7NpyT4FNAzhC7SfZq4/omhSgasE64sV/8aIgXWjWOf1ij0C GAIRfAozuCrhm4nILm5fmghZu8lmix24gnrmTplxsUc4YzRSwgZ61m3SCCGNAKtxjIgK xnAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=z1EPeptCFoIaJaJVsVX640bsVfb5dv09v+eTesBEdqU=; b=XbW+GRJ49JLSHKnrUgw3MZ5xib3C9FW7bXRiATc8ghbtUOzWMu2c+9SHMFP8npTVo1 MyG7igmx5lHdeTSIQ3AY8kk8WYK4McEJszJfY1kQG2ugxjaFFk5HtdMLaji3dBSm+KI6 v1NUUUjEB4hA1WanhsQJEToQVNyjBOMbh6p9uRUZg/tv68I295KftZYTgbeVRnGyrFWT a9oqyXHb7rfNWdb3/riqZw6QsJvBPJsEn/lsmxCXGrkxXjiWF52sxd2bxD5mYjOZWZ6y mShVLEDMEacTMCpXd1+ZL1P76vovidngDSV4py6PvQgqTFOsbLr6ayaAcHv1MnibS6b3 5Fjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=L33UBWhh; 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=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h15si5573034edb.566.2021.03.25.21.38.12; Thu, 25 Mar 2021 21:38:35 -0700 (PDT) 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=@chromium.org header.s=google header.b=L33UBWhh; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbhCZEej (ORCPT + 99 others); Fri, 26 Mar 2021 00:34:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229787AbhCZEeF (ORCPT ); Fri, 26 Mar 2021 00:34:05 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86419C061763 for ; Thu, 25 Mar 2021 21:34:05 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id 32so3795980pgm.1 for ; Thu, 25 Mar 2021 21:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=z1EPeptCFoIaJaJVsVX640bsVfb5dv09v+eTesBEdqU=; b=L33UBWhhTV0f0TkrQMXt+B0VKX9Vlp3fb+/k78HIXW/yrd0LU0Om96mIq2bNG+r7xH 5RzEDHiSIxJe6Qo1t9vt49eiID6LFyta9K33XFxXNDxpmV/PlZ0wbsclB3yvkHHpJffs QjWaq7BabNEk9dYp9Y1/B2mFH7xUCJOw1mokE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=z1EPeptCFoIaJaJVsVX640bsVfb5dv09v+eTesBEdqU=; b=khjTGrWAgITlnFJ5C3fIH04ip5MLZbzIUiymaNrixjM2IqlA9hLjb4EnABMHG+fzZy AtlDO/jnRIWIyVRhn8dlWzWHftkXSs6mF8wynGNRplEg90+xVwmLcveeHS8DoDsVPBQo hiGwf2nbWObKQr7Lbv8z9S+u6MwmjWRcOHBGzSalrC1YWxE+UN/jpfU+HwBmdVkcyHq0 piDz50d9Wep1+srWZ8yj/XkbSNdD3PAa+3juhbxPXL5C/t3/l+kQVvKHPDm8aB7md+Be ocpax0b9854C6/LqzJizFMWbsVaiOn1TQ6mRg0x8DhmxHsMQ+jJQJduht4heIdT2tlv9 N1lw== X-Gm-Message-State: AOAM531jDma8dqFmLPOeZBbN0RqppIFMJJrKiyt9sSYSYNniW0LFCygh rnET8OM+8HV+ZMUJIKVMqQ5bNg== X-Received: by 2002:a62:fc90:0:b029:213:be9a:7048 with SMTP id e138-20020a62fc900000b0290213be9a7048mr11194418pfh.4.1616733245174; Thu, 25 Mar 2021 21:34:05 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id l4sm7513908pgn.77.2021.03.25.21.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 21:34:04 -0700 (PDT) Date: Thu, 25 Mar 2021 21:34:03 -0700 From: Kees Cook To: Sami Tolvanen Cc: Nathan Chancellor , Nick Desaulniers , Masahiro Yamada , Will Deacon , Jessica Yu , Arnd Bergmann , Tejun Heo , "Paul E. McKenney" , Christoph Hellwig , Peter Zijlstra , 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 Subject: Re: [PATCH v3 04/17] module: ensure __cfi_check alignment Message-ID: <202103252133.339A7A49@keescook> References: <20210323203946.2159693-1-samitolvanen@google.com> <20210323203946.2159693-5-samitolvanen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210323203946.2159693-5-samitolvanen@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 23, 2021 at 01:39:33PM -0700, Sami Tolvanen wrote: > CONFIG_CFI_CLANG_SHADOW assumes the __cfi_check() function is page > aligned and at the beginning of the .text section. While Clang would > normally align the function correctly, it fails to do so for modules > with no executable code. > > This change ensures the correct __cfi_check() location and > alignment. It also discards the .eh_frame section, which Clang can > generate with certain sanitizers, such as CFI. > > Link: https://bugs.llvm.org/show_bug.cgi?id=46293 > Signed-off-by: Sami Tolvanen Yay macros! :) Reviewed-by: Kees Cook -- Kees Cook