From mboxrd@z Thu Jan 1 00:00:00 1970 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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL 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 077B1C4332B for ; Wed, 17 Mar 2021 16:07:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B72FC64DD1 for ; Wed, 17 Mar 2021 16:07:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232291AbhCQQGa (ORCPT ); Wed, 17 Mar 2021 12:06:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232224AbhCQQF5 (ORCPT ); Wed, 17 Mar 2021 12:05:57 -0400 Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C314C06175F for ; Wed, 17 Mar 2021 09:05:56 -0700 (PDT) Received: by mail-vs1-xe33.google.com with SMTP id a15so1338476vsi.7 for ; Wed, 17 Mar 2021 09:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=v2KL8kozO5erdsP6tss56cJzIGTvQeUixy1fwBfyf9E=; b=L+sKGzrqRGkayjrIbx3UhJgUwtMmmzJiP7xVkweSApuxYoYxI4LeRgqnM7E2cVNFT2 L45AC/pwNU1fz3kkRnhcRp5Khlan5/Osp695ao4Zeq1DMR4U7/JYz+4t7MEdHv1+9qwG zwxXB5v4s7x+iSvmDyAA8j6J5F/LEkxHHfS2qwphtbLFYhEDWUv95/kvZL3Trdu79AyT NNZbI9fnUQcz8+iyHBFSLC3Wa55Q+r5QDMMipTfIOHdnYaK4LSCdSwlrvXeW0lhZ4AF5 WXtzd1I3zdoC7C//HbblJCanoQNzLOyg1wur/OGHsKtTZ3gw78PQ17RnksLC/ossk+fU fcmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=v2KL8kozO5erdsP6tss56cJzIGTvQeUixy1fwBfyf9E=; b=G+8JSUwnYPLmRP1fiuqvOHKAntT8czyiW2QRv9LWK8PRaCKd1JqG6FRAxgdKXKI0TQ vdzKayABGEDVctXWvLiWgM50UkIloJwLFMmbpB6peV3iRfjbNlS8+zwr9X66tNyfE250 /iS7g3AJkXfYNyS5YHMFMlQ1cQ62x1esXdCXIafAsWeXJQqccbDbRni2WwqF6MoWosPN b70b8b6LEiu9b3bvTdUApJXnEYjIUHszxHU/Se7S71ATNc9daIGky4InEg1G0dRPOFeT 79eipYyhjPhioOki0zGpEBAa7YiixBoE4r+sAHJfb8A3F+3NGgFYhIsdw3OhE2NwjoxI 1HDQ== X-Gm-Message-State: AOAM5332xsegfSAnu2+LPaK/tB5TRhoiv1pDAjjkyeGA9+7aYWszp4Ox IMMYfMlTDl9iurGSvFyPcP2O5d9HEm7d8qJQ+LS8Qw== X-Google-Smtp-Source: ABdhPJxaHsoJ+bz7hvftL5zgwqX9DbDHuTiz3ir8dA5jWQPZop9wwdoJTujQjPIzJwP11rynhQBtRWijCPDqibIFRy4= X-Received: by 2002:a67:db98:: with SMTP id f24mr4264884vsk.13.1615997155510; Wed, 17 Mar 2021 09:05:55 -0700 (PDT) MIME-Version: 1.0 References: <20210312004919.669614-1-samitolvanen@google.com> <20210312004919.669614-7-samitolvanen@google.com> <20210312061304.GA2321497@infradead.org> In-Reply-To: <20210312061304.GA2321497@infradead.org> From: Sami Tolvanen Date: Wed, 17 Mar 2021 09:05:44 -0700 Message-ID: Subject: Re: [PATCH 06/17] kthread: cfi: disable callback pointer check with modules To: Christoph Hellwig Cc: Kees Cook , Nathan Chancellor , Nick Desaulniers , Masahiro Yamada , Will Deacon , Jessica Yu , Arnd Bergmann , Tejun Heo , bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch , linux-arm-kernel , linux-kbuild , PCI , LKML Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 11, 2021 at 10:13 PM Christoph Hellwig wrote: > > On Thu, Mar 11, 2021 at 04:49:08PM -0800, Sami Tolvanen wrote: > > With CONFIG_CFI_CLANG, a callback function passed to > > __kthread_queue_delayed_work from a module points to a jump table > > entry defined in the module instead of the one used in the core > > kernel, which breaks function address equality in this check: > > > > WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); > > > > Disable the warning when CFI and modules are enabled. > > > > Signed-off-by: Sami Tolvanen > > --- > > kernel/kthread.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/kernel/kthread.c b/kernel/kthread.c > > index 1578973c5740..af5fee350586 100644 > > --- a/kernel/kthread.c > > +++ b/kernel/kthread.c > > @@ -963,7 +963,13 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker, > > struct timer_list *timer = &dwork->timer; > > struct kthread_work *work = &dwork->work; > > > > - WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); > > + /* > > + * With CFI, timer->function can point to a jump table entry in a module, > > you keep spewing this comment line that has exactly 81 characters and > thus badly messes up read it with a normal termina everywhere. > > Maybe instead of fixing that in ever duplication hide the whole check in > a well documented helper (which would have to be a macro due to the > typing involved). Sure, that sounds cleaner. I'll add a helper macro in v2. Sami From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 77F1BC433E9 for ; Wed, 17 Mar 2021 16:07:34 +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 D2A9161606 for ; Wed, 17 Mar 2021 16:07:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2A9161606 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:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+MUfmfFAMZeeEJQrd8Z+LO2nNne08x3PRxD9bLp3ubc=; b=GLRROM4WcI2pdsbVi6dZFHNcb 7ozzafxV/KFuJWjqRmF+pzihDYFDU69tUXhOLNTD4qA2UroQydbW5o6i6SFK2vX5sG8IKEzzWHgxR y8NUuSSZd/UyvrOWZ2BaLBzYhguncdVGj16ijqnF/eNfzvYZtO5mTt8LHmnLrrhKA0WiiRgWWUgOM xmh/rw2ow3NGWUye7rO39AtoP1hks3UKzSj6wsP0AwMyhSY9rneQw8Lu2cjLay2zRIizeAACk1xUe 16QayAlHRTjsjJ73vPoNKP/v9wMSn1O0G3kUa5SEPaWHWVv4emNzml5wVXFrUMx6gxUH8exZ/kOmw YkM0rWDuw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMYgN-003UY5-7S; Wed, 17 Mar 2021 16:06:03 +0000 Received: from mail-vs1-xe2a.google.com ([2607:f8b0:4864:20::e2a]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMYgG-003UVv-U3 for linux-arm-kernel@lists.infradead.org; Wed, 17 Mar 2021 16:05:58 +0000 Received: by mail-vs1-xe2a.google.com with SMTP id p24so1321278vsj.13 for ; Wed, 17 Mar 2021 09:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=v2KL8kozO5erdsP6tss56cJzIGTvQeUixy1fwBfyf9E=; b=L+sKGzrqRGkayjrIbx3UhJgUwtMmmzJiP7xVkweSApuxYoYxI4LeRgqnM7E2cVNFT2 L45AC/pwNU1fz3kkRnhcRp5Khlan5/Osp695ao4Zeq1DMR4U7/JYz+4t7MEdHv1+9qwG zwxXB5v4s7x+iSvmDyAA8j6J5F/LEkxHHfS2qwphtbLFYhEDWUv95/kvZL3Trdu79AyT NNZbI9fnUQcz8+iyHBFSLC3Wa55Q+r5QDMMipTfIOHdnYaK4LSCdSwlrvXeW0lhZ4AF5 WXtzd1I3zdoC7C//HbblJCanoQNzLOyg1wur/OGHsKtTZ3gw78PQ17RnksLC/ossk+fU fcmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=v2KL8kozO5erdsP6tss56cJzIGTvQeUixy1fwBfyf9E=; b=XwoxeKRYhI2H6mis1bgVt3xmEIHpb4e4mqAXDx2As6KdeOjHDCwhPqSvH2WdyxgBuS v0FIazAB8d5q3vOiII2sCSykSvJ0Kq/nWkN6E5sEYfycsLBnXEvm7QwMmT+73n7JC58t /x8Jjg0NPmjGfpYdlxyY1bFPCHfBAfi6Jj4b/3g8gVHo2vlqQVS6B+pZY+yJBpil04MD e4IxWlNaSWPWaSjPWvI+Rlur9pmBYaWdrbi69+ZNbd1pAATPKAXr4nCdq6Jav5xSKjGK SJzDn4YxbMQPB5Pe9bUlnpeMj2SNKYcVXeihKfC55bhgSNKHw9/EKXmdEUTasSTHwgkr zQcA== X-Gm-Message-State: AOAM532oH3oloneyJayGTmgW6d6Q7nDhRKOVo8AW5d4jemQnGcZzHZZt NLXWsiUsfHW2+cZ6JVNUJmrxPkGZEJV4pumfOidztQ== X-Google-Smtp-Source: ABdhPJxaHsoJ+bz7hvftL5zgwqX9DbDHuTiz3ir8dA5jWQPZop9wwdoJTujQjPIzJwP11rynhQBtRWijCPDqibIFRy4= X-Received: by 2002:a67:db98:: with SMTP id f24mr4264884vsk.13.1615997155510; Wed, 17 Mar 2021 09:05:55 -0700 (PDT) MIME-Version: 1.0 References: <20210312004919.669614-1-samitolvanen@google.com> <20210312004919.669614-7-samitolvanen@google.com> <20210312061304.GA2321497@infradead.org> In-Reply-To: <20210312061304.GA2321497@infradead.org> From: Sami Tolvanen Date: Wed, 17 Mar 2021 09:05:44 -0700 Message-ID: Subject: Re: [PATCH 06/17] kthread: cfi: disable callback pointer check with modules To: Christoph Hellwig Cc: Kees Cook , Nathan Chancellor , Nick Desaulniers , Masahiro Yamada , Will Deacon , Jessica Yu , Arnd Bergmann , Tejun Heo , bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch , linux-arm-kernel , linux-kbuild , PCI , LKML X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210317_160557_078378_D4103E90 X-CRM114-Status: GOOD ( 23.09 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Mar 11, 2021 at 10:13 PM Christoph Hellwig wrote: > > On Thu, Mar 11, 2021 at 04:49:08PM -0800, Sami Tolvanen wrote: > > With CONFIG_CFI_CLANG, a callback function passed to > > __kthread_queue_delayed_work from a module points to a jump table > > entry defined in the module instead of the one used in the core > > kernel, which breaks function address equality in this check: > > > > WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); > > > > Disable the warning when CFI and modules are enabled. > > > > Signed-off-by: Sami Tolvanen > > --- > > kernel/kthread.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/kernel/kthread.c b/kernel/kthread.c > > index 1578973c5740..af5fee350586 100644 > > --- a/kernel/kthread.c > > +++ b/kernel/kthread.c > > @@ -963,7 +963,13 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker, > > struct timer_list *timer = &dwork->timer; > > struct kthread_work *work = &dwork->work; > > > > - WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); > > + /* > > + * With CFI, timer->function can point to a jump table entry in a module, > > you keep spewing this comment line that has exactly 81 characters and > thus badly messes up read it with a normal termina everywhere. > > Maybe instead of fixing that in ever duplication hide the whole check in > a well documented helper (which would have to be a macro due to the > typing involved). Sure, that sounds cleaner. I'll add a helper macro in v2. Sami _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel