Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp512153pxb; Mon, 25 Oct 2021 12:45:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMKhRIfcIc3YNG58rElcZJcIWyDqY+O4M9vnff+JHA769kK3HZijn5XGfItpD3OJm8I8QA X-Received: by 2002:a17:902:c7d3:b0:13f:f813:833e with SMTP id r19-20020a170902c7d300b0013ff813833emr18278558pla.68.1635191149492; Mon, 25 Oct 2021 12:45:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635191149; cv=none; d=google.com; s=arc-20160816; b=sFzlbnYfPmXLA9Es/OxW1qLjvJhcx69w8iRcXg4ch7nrRRol+/dBs9K6o4DKXfc4sQ Tw2KMJgIJmKuXt4gKaYrG030HTDqKFjasI/SfBNTUJMr8izVHHnvoBm8YrAiU2SULcuL WSB3szMJaDJ0Y9TTxr9XqqTjisAcCFy9Jcc/knOySWXkXQQFu3FAFlPo6tdH+zm6OrcM nkqWjy0G2gNjDpa7jr9e2DITDuy6Y+srhKikUt3Ra58dIGb09drVCwEQtqk9HKfuRxyb RnoAV7o6OMLLvTUbSis71ooR6cIlchywrsUFi+JCrCN7HTexiK/tcFZB9nZebz7w7Wjy eMhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gAjwPpAm9AHCOpDBowQVnwLZm25Lc1nS7KWszPngqtg=; b=fuhK7+YVuFD304fkRINHW4/3DgsZBBHNrhoQ/SoRXvUcsoQ0DpnWY1ww9Eyb/e6O9P vc/fpgIx222DUrQ3apYho+hSBtWkaW3OaomNw5j9jFgBfeVKdO8A9ADOd+VSQZW3TdvR ZHehq6han7SAaIZFZWqQcoG4ITk9sHOs1w/4ErccVWCBenXkAXs0u9bytCQK88Dm9eQM a087enRqZQCDAucGzdA7M/fsFmm2pFIKeeNnGtzD7ONkP9L6pFdcoAhzDJf1Eqr0LhM7 VzM+AU/dweL5AzOI5npXmZunRLNYY/Ooj5X5V42Ikoot04kWCDUQlaO7fCI6ed/+o/gI 0Q/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zCfI08mw; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l15si11517964plg.78.2021.10.25.12.45.36; Mon, 25 Oct 2021 12:45:49 -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=@linuxfoundation.org header.s=korg header.b=zCfI08mw; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235771AbhJYTp6 (ORCPT + 99 others); Mon, 25 Oct 2021 15:45:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:53204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237094AbhJYTis (ORCPT ); Mon, 25 Oct 2021 15:38:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F9E960F70; Mon, 25 Oct 2021 19:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635190489; bh=HE4PmzW54rEQQgoPfYsS2lGpZo21B1lfgplaFYBTJBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zCfI08mwdpLa/6JCKll4dF46Ypg8VbDXfcQKKyA80oP0nHH0I6crGzgZN7I8QIaKy q2wbwMdXBVWe+dMZBIgf89BbG4ReElmwZS+Zc/LALLRwEGuwlXw5XrkVvuTfF2b8la ZrXE/XdngddErLGQiaoszo4ooOA/V771/+lSvp0Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , Brendan Higgins , David Gow , Shuah Khan , Sasha Levin Subject: [PATCH 5.10 70/95] gcc-plugins/structleak: add makefile var for disabling structleak Date: Mon, 25 Oct 2021 21:15:07 +0200 Message-Id: <20211025191007.069144838@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211025190956.374447057@linuxfoundation.org> References: <20211025190956.374447057@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brendan Higgins [ Upstream commit 554afc3b9797511e3245864e32aebeb6abbab1e3 ] KUnit and structleak don't play nice, so add a makefile variable for enabling structleak when it complains. Co-developed-by: Kees Cook Signed-off-by: Kees Cook Signed-off-by: Brendan Higgins Reviewed-by: David Gow Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- scripts/Makefile.gcc-plugins | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins index 952e46876329..4aad28480035 100644 --- a/scripts/Makefile.gcc-plugins +++ b/scripts/Makefile.gcc-plugins @@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ += -fplugin-arg-structleak_plugin-byref gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \ += -fplugin-arg-structleak_plugin-byref-all +ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK + DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable +endif +export DISABLE_STRUCTLEAK_PLUGIN gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \ += -DSTRUCTLEAK_PLUGIN -- 2.33.0