stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Sasha Levin <sashal@kernel.org>,
	clang-built-linux@googlegroups.com
Subject: [PATCH AUTOSEL 5.11 22/23] gcov: clang: fix clang-11+ build
Date: Mon, 19 Apr 2021 16:43:41 -0400	[thread overview]
Message-ID: <20210419204343.6134-22-sashal@kernel.org> (raw)
In-Reply-To: <20210419204343.6134-1-sashal@kernel.org>

From: Johannes Berg <johannes.berg@intel.com>

[ Upstream commit 04c53de57cb6435738961dace8b1b71d3ecd3c39 ]

With clang-11+, the code is broken due to my kvmalloc() conversion
(which predated the clang-11 support code) leaving one vmalloc() in
place.  Fix that.

Link: https://lkml.kernel.org/r/20210412214210.6e1ecca9cdc5.I24459763acf0591d5e6b31c7e3a59890d802f79c@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 kernel/gcov/clang.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/gcov/clang.c b/kernel/gcov/clang.c
index c466c7fbdece..b81f2823630d 100644
--- a/kernel/gcov/clang.c
+++ b/kernel/gcov/clang.c
@@ -369,7 +369,7 @@ static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn)
 	INIT_LIST_HEAD(&fn_dup->head);
 
 	cv_size = fn->num_counters * sizeof(fn->counters[0]);
-	fn_dup->counters = vmalloc(cv_size);
+	fn_dup->counters = kvmalloc(cv_size, GFP_KERNEL);
 	if (!fn_dup->counters) {
 		kfree(fn_dup);
 		return NULL;
-- 
2.30.2


  parent reply	other threads:[~2021-04-19 20:44 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-19 20:43 [PATCH AUTOSEL 5.11 01/23] HID: google: add don USB id Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 02/23] HID: asus: Add support for 2021 ASUS N-Key keyboard Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 03/23] HID: alps: fix error return code in alps_input_configured() Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 04/23] HID cp2112: fix support for multiple gpiochips Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 05/23] HID: wacom: Assign boolean values to a bool variable Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 06/23] soc: qcom: geni: shield geni_icc_get() for ACPI boot Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 07/23] dmaengine: xilinx: dpdma: Fix descriptor issuing on video group Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 08/23] dmaengine: xilinx: dpdma: Fix race condition in done IRQ Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 09/23] ARM: dts: Fix swapped mmc order for omap3 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 10/23] m68k: fix flatmem memory model setup Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 11/23] net: geneve: check skb is large enough for IPv4/IPv6 header Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 12/23] dmaengine: tegra20: Fix runtime PM imbalance on error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 13/23] s390/entry: save the caller of psw_idle Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 14/23] arm64: kprobes: Restore local irqflag if kprobes is cancelled Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 15/23] xen-netback: Check for hotplug-status existence before watching Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 16/23] cavium/liquidio: Fix duplicate argument Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 17/23] i2c: mv64xxx: Fix random system lock caused by runtime PM Sasha Levin
2021-04-20  6:30   ` Marek Behún
2021-04-25 21:41     ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 18/23] kasan: fix hwasan build for gcc Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 19/23] csky: change a Kconfig symbol name to fix e1000 build error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 20/23] ia64: fix discontig.c section mismatches Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 21/23] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Sasha Levin
2021-04-19 20:43 ` Sasha Levin [this message]
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 23/23] readdir: make sure to verify directory entry for legacy interfaces too Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210419204343.6134-22-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=clang-built-linux@googlegroups.com \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=stable@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).