Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp688569pxb; Mon, 25 Oct 2021 16:41:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxreJG39MjHoIlUhmLZ9f5pCgJKR1yTfrFadW3f0aF1NhNbORoHlpCZSTia1W90nFnoJbjX X-Received: by 2002:a17:90a:d510:: with SMTP id t16mr24795860pju.55.1635205309961; Mon, 25 Oct 2021 16:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635205309; cv=none; d=google.com; s=arc-20160816; b=OscJqVjVmDi+SHEf1JEK8/YFyfLmR0WPI/O/qHgHdJR/ytPtAekdPozX6LayHJ2c9J Lh/LnHMQAzzj4fkAOu93gyDEzDf3KtruVj1AspNgI66aKsZq/9sjOm+rbyqAKY9uZJik fXBkbPtwWBj1qpuw3JQavDgS5WkmDKpdK1/c7AEVbGcxe99Uo5YPBytBei57UETKfcZs jhBFu5kGNV1MVH4gGnE4+AFAb+TjnEtDIbALNVT2IGdjQZJxN2U+ybWGXHGKlWS3Y5ZX uFStiQAZLjeA5YuhBy2u4aajI7BDQO9IM+OIN8IgN8Xvy0bLNTVh0wJkYTsuwj1ELMjH GEOA== 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=5lp2Fy4lf1HLGpdkGfdjoYXNWIyTioEZyaQErAiXQxc=; b=Wuss+kZYv3M3LRYLynlHUdmikPRRi9U2ylJopxZyCKw+XFhea27dJbrcGUOKV2EdGB sqcclPLHheOpHZ1gQDkee6QT9jvXNUf0+ty1qrz/BmAPkJ+ATWYd+LGQZYul4ji9R2vG g+IY91O3VtPXegfbk/rNsFCvY2QLtWrzsJ26yqvQ7jAVkzZOZ8Ug7BhkfwX74gwNohAs 04GJYqjjlpSS/8Lvbl0mdyMnzWpUj80Cw7/ym6NIoW12ARCDb/h+9vD6UPxq/wc1f0UE LYjSY492IAdJxqZwVeQDto/wAzxE1LjGaO5U0x/TEMQP0KFTVGXjv/eYoO0YCGJHGMJH nOHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C6MFEVoH; 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 l18si31461000plh.50.2021.10.25.16.41.24; Mon, 25 Oct 2021 16:41: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=C6MFEVoH; 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 S235991AbhJYTc4 (ORCPT + 99 others); Mon, 25 Oct 2021 15:32:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235587AbhJYT2s (ORCPT ); Mon, 25 Oct 2021 15:28:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D1C7F6115C; Mon, 25 Oct 2021 19:25:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635189919; bh=pNZwSpSFEOCU7NUQbTWtrABmKlokw4WqU2KF4TizP0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C6MFEVoHooz4EiyRlgXVbMOX8h9zz8HQqj1pL3OuJbZFPK5ab5sOFo81MuBzjVw+K XqZPy1Cv9M+6lPjhabLjjOjJ8oPA9uGvd8g7d6fPfJ73cz6wl4o2KHgroOZSnZZXs6 GbFyKSAH9vGe/IuU0o1fYA0l6XVbA92qedTnS3p0= 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 4.19 26/37] gcc-plugins/structleak: add makefile var for disabling structleak Date: Mon, 25 Oct 2021 21:14:51 +0200 Message-Id: <20211025190933.482057424@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211025190926.680827862@linuxfoundation.org> References: <20211025190926.680827862@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 0a482f341576..93ca13e4f8f9 100644 --- a/scripts/Makefile.gcc-plugins +++ b/scripts/Makefile.gcc-plugins @@ -17,6 +17,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE) \ += -fplugin-arg-structleak_plugin-verbose 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