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, URIBL_BLOCKED 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 60980C433DB for ; Thu, 18 Mar 2021 18:52:09 +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 D760664E90 for ; Thu, 18 Mar 2021 18:52:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D760664E90 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=X7FXeissa8DNy/k4RugjF5GW26EI0cb/XM8lMceOxRU=; b=M3Cknhpk/w+fX16qbGGh3t3L4 4+i0Ijjfpy0WaN6R0HpjdUIn8XRoGfXzWDTBc731O+tW9EY9wAB0lsJkl59gE4lCXQht8vA272JDd 6yKRRwHvSnIOMQVTyUCXWKZT5SzW+nTTbYkOh9H0tLKC53SRvsg3VIYoAua9TW7mJyjqBtmP6FaBa W6Rhz9uNyWJg3O4IYBByTOPG7t8MiT5fsbKBX+VZmrvAhP1zRD0/JN57lFSS/752cWTbzCkieya5W eYVWk5j293yiKMEzLaI+VdA1JlcI+8w3DEPqkiyHbfGbs4xvF/qYg79tXvMAK6tVLYJBSmoNkUjRU bkmx3AiWA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMxiw-005t0u-7H; Thu, 18 Mar 2021 18:50:22 +0000 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMxin-005szo-DG for linux-arm-kernel@lists.infradead.org; Thu, 18 Mar 2021 18:50:16 +0000 Received: by mail-lj1-x22c.google.com with SMTP id y1so8790985ljm.10 for ; Thu, 18 Mar 2021 11:50:13 -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=Fbc9sU+W6vKEWiVuzKDAzNw80eLikWEk6fODgolKFf4=; b=gV9qbJJbak0NwyikP8/6txEAmG7g7SLhIJX+Fba6IeRHX5IoxW3jDRmclVA8qlMsfU kBomGiglv5B7gIvKdwq5SGwJtUllfBgQLIHwNh/WVAb97ZqgqeJTyXusK0PW1Wj+fYOv rl0s1N7K+FNq2o56hIXTtivX0CxG7t7dEc5d97ivUIvX37ZqHrzNwlcrq9j4CB6QD5AZ FeHFP2afJV+FdE2b5evL+4dEfkVW7uNreiqLUlcby8ZsFQAMpnQJcSvrJu2jiTgww+aJ 381Y3D1oh2tZ8y5qgSnmZEVEwtk5rESCQTRFKxxhKk5x/kGAlFPIcPsl06+uQd4ls14G ZbQQ== 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=Fbc9sU+W6vKEWiVuzKDAzNw80eLikWEk6fODgolKFf4=; b=sYBK8xtMgh/jmFlUJ5ZYrM3PMKLgRm04yStIdTM9MV+eh5thxTNTQd1/E9lUG2zuBS jiOZFpO4ZaGeOuVgNV6l7f9vsaMo1n7qTnqng9vc3tyv3CcrJOWn/CFeFpW6dVu7IlE6 g4Li4fevhKrZvD5R4wXbUb3HWHh1kLD3uk69D9++oLBKtzLOIwcbJKRn1AP50wsf4k9O RPbv0x5uvomic76mv7O6i8JM0UkeqruvG+rOM2ahFXlge9/gupqxZrIzirYll2tHycST eorNGo/kTMbCCnpciCdxchY6J9ifXFfbGu3DjVFY5MiXw7OpbsNqDxwbAq2Q+m6dLMhN HNZw== X-Gm-Message-State: AOAM531cq615Zhb71hVlRnGZKl488o57akM8MTHrEnp+or9E8OXVXLTv LY3mXSn5/R5yE836dIJ/kDkLBOTacYoPP6xbut3GbA== X-Google-Smtp-Source: ABdhPJyac78CV6QxdSD/anwHq7ZKXrz96rfsGARqrb7ZO61dgR01Qx1cNIoMLgd8++IChAjKUBiov3LjVFDjuzYsR2s= X-Received: by 2002:a2e:b88b:: with SMTP id r11mr6028781ljp.495.1616093412369; Thu, 18 Mar 2021 11:50:12 -0700 (PDT) MIME-Version: 1.0 References: <20210318171111.706303-1-samitolvanen@google.com> <20210318171111.706303-6-samitolvanen@google.com> In-Reply-To: <20210318171111.706303-6-samitolvanen@google.com> From: Nick Desaulniers Date: Thu, 18 Mar 2021 11:50:00 -0700 Message-ID: Subject: Re: [PATCH v2 05/17] workqueue: use WARN_ON_FUNCTION_MISMATCH To: Sami Tolvanen Cc: Kees Cook , Nathan Chancellor , Masahiro Yamada , Will Deacon , Jessica Yu , Arnd Bergmann , Tejun Heo , "Paul E. McKenney" , Christoph Hellwig , bpf , linux-hardening@vger.kernel.org, linux-arch , Linux ARM , Linux Kbuild mailing list , PCI , LKML X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210318_185013_898643_70D266B5 X-CRM114-Status: GOOD ( 23.06 ) 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 18, 2021 at 10:11 AM Sami Tolvanen wrote: > > With CONFIG_CFI_CLANG, a callback function passed to > __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 != delayed_work_timer_fn); > > Use WARN_ON_FUNCTION_MISMATCH() instead to disable the warning > when CFI and modules are both enabled. Does __cficanonical help with such comparisons? Or would that be a very invasive change, if the concern was to try to keep these checks in place for CONFIG_CFI_CLANG? > > Signed-off-by: Sami Tolvanen > --- > kernel/workqueue.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index 0d150da252e8..03fe07d2f39f 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -1630,7 +1630,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, > struct work_struct *work = &dwork->work; > > WARN_ON_ONCE(!wq); > - WARN_ON_ONCE(timer->function != delayed_work_timer_fn); > + WARN_ON_FUNCTION_MISMATCH(timer->function, delayed_work_timer_fn); > WARN_ON_ONCE(timer_pending(timer)); > WARN_ON_ONCE(!list_empty(&work->entry)); > > -- > 2.31.0.291.g576ba9dcdaf-goog > -- Thanks, ~Nick Desaulniers _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel