Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp415810pxa; Fri, 21 Aug 2020 10:29:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOvv/FsyH6y1waGVou9zfms8G2wFA15fGiwvYFCMuRz4LOYXO1nCgnZBCp7V4rhOlUYVAP X-Received: by 2002:a17:906:8389:: with SMTP id p9mr3951692ejx.391.1598030972177; Fri, 21 Aug 2020 10:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598030972; cv=none; d=google.com; s=arc-20160816; b=qcpHSNSDKSJF0CQVMrw8nvwzZM0NAnc2oIaD3hGerxqc8WA0FpycHcH08GgCYcMSW1 J62LXV30gjOeX5PFMIlj4w3PLvFcLegH8Q3QdkZ+fmaz6wllfxmoArZ2fPS1jHY7FIIa YD8XDcu/BVy7Vv1xCpjxR+ub5G9sGQHpqsX5r5LacRtYm/128nx+5VlWFPWAC5xLlyt3 hIbW70KD2WeZuyOs2ayvod/lOE5sKqYCA4MJjcfC+G0ENshvMqa0pTS+cxFWyZ72sgR5 U1mlgodO/md9kfIfyjdoXTnAAPOxJ4ORaZBPQBH+5oNV37BmKvyHSGaIaI3dZXTpN6lD r9ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sCj7sN2uQ6ZqikiM2mArFLFMtgdIxc36LNJQEAQcEJ4=; b=ilvsgHRSwo3M9VK5NzFYCbYOFRoGXEEI5hscINs3hnIyYJCg8h2o8EVoV8t701zsuu pLPpyoQEsYIRs/SmHRVEe9EerQ9v8KrhvYOvWPG2qiZix1p3oddSQab21/aSzZe5VLjb IxJx5sKzckASnj9Owj3Agy+UPYx2Z3OVOwUgO3+c3BbchDGPUi8Sxa+riJ8SYCVKGc1x U/VAaZwl9xxeOdTh2Fs60suAsenOenYd5IN7w+4VWMyk2l+KHD0+wFhLAInG/JyvwoWB T8hJscWEgaqLd1JzXXlq/GFYcPCJLZBohcHVFfnIhS5PvmQ34x7DceLXgN39Rx5FO+N0 zOew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2RIaFJ1s; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bq8si1837285ejb.670.2020.08.21.10.29.08; Fri, 21 Aug 2020 10:29:32 -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=@kernel.org header.s=default header.b=2RIaFJ1s; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727943AbgHUR2j (ORCPT + 99 others); Fri, 21 Aug 2020 13:28:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:46654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727012AbgHUQOp (ORCPT ); Fri, 21 Aug 2020 12:14:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD2CF22BED; Fri, 21 Aug 2020 16:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026481; bh=oTjC9jfaLqaZgNMzxkpn5Xgk4LZV2PW+EeOGjegi/zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2RIaFJ1sLf2LhZGIIxhVAZE43Oo+KLH/eXBni4hxHTs4TEPJ5xS78wEd1EiAT5vZT kZYNaLu4yZW2BhqiisiD6qXrJ2Fs7zQUpujmBoFwQkZvOvB0nHdadbrjWqZm229rV+ suar4PQUpuocamw5ATaSA9TmG5F8IeOpyK4OfJug= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Popov , Kees Cook , Sasha Levin Subject: [PATCH AUTOSEL 5.8 14/62] gcc-plugins/stackleak: Don't instrument itself Date: Fri, 21 Aug 2020 12:13:35 -0400 Message-Id: <20200821161423.347071-14-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Popov [ Upstream commit 005e696df65d0ff90468ecf38a50aa584dc82421 ] There is no need to try instrumenting functions in kernel/stackleak.c. Otherwise that can cause issues if the cleanup pass of stackleak gcc plugin is disabled. Signed-off-by: Alexander Popov Link: https://lore.kernel.org/r/20200624123330.83226-2-alex.popov@linux.com Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- kernel/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/Makefile b/kernel/Makefile index f3218bc5ec69f..155b5380500ad 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -125,6 +125,7 @@ obj-$(CONFIG_WATCH_QUEUE) += watch_queue.o obj-$(CONFIG_SYSCTL_KUNIT_TEST) += sysctl-test.o +CFLAGS_stackleak.o += $(DISABLE_STACKLEAK_PLUGIN) obj-$(CONFIG_GCC_PLUGIN_STACKLEAK) += stackleak.o KASAN_SANITIZE_stackleak.o := n KCSAN_SANITIZE_stackleak.o := n -- 2.25.1