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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B6019C169C4 for ; Mon, 11 Feb 2019 14:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DC1820838 for ; Mon, 11 Feb 2019 14:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895101; bh=N4y+9pC3UG2d+NHw9Jl5js2xUnc1xnoRi0pyyDxKBn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gw0aOSI8pwKhxLCsGeK1u/WHL8mhM2i6JMHmlDEeIjA1mpFnZ1Eh0oC1JuDVA6OiC j6fHd3GTi2xnyGUoFw3RFQFoeMmMK923d5QpBSwmdJCyYLivnoqvC5h4jRmfmrbI4C FA60frC18W7+y87g8aqw29URshxXda4DO1Ej4Oe8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729311AbfBKOZA (ORCPT ); Mon, 11 Feb 2019 09:25:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:58262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726074AbfBKOY5 (ORCPT ); Mon, 11 Feb 2019 09:24:57 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1974620821; Mon, 11 Feb 2019 14:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895096; bh=N4y+9pC3UG2d+NHw9Jl5js2xUnc1xnoRi0pyyDxKBn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Icu0s4wMJyFr2SUbmRlxgPpmnsFnVWOw4MeHjzO0Pdkg39pKNTU9h3ckFVAbM9Jdd kr8YQ1lxcxeQBx1PbUiL82cNhHyT/EBhty1QyOfSn2Qwc20sp85CX1/J6Exm1dNLIS jjXtJbzyH+i+mK6Rg4OVE5BRaY9JDFFG37bduFHY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Rutland , Nicholas Mc Guire , Will Deacon , Sasha Levin Subject: [PATCH 4.20 091/352] perf: arm_spe: handle devm_kasprintf() failure Date: Mon, 11 Feb 2019 15:15:18 +0100 Message-Id: <20190211141851.695251746@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 754a58db6a556e6e5f5e32f3e84e7d67b5bf9c8e ] devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to 'name' is not safe if unchecked. If NULL is passed in for name then perf_pmu_register() would not fail but rather silently jump to skip_type which is not the intent here. As perf_pmu_register() may also return -ENOMEM returning -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here as well. Acked-by: Mark Rutland Fixes: d5d9696b0380 ("drivers/perf: Add support for ARMv8.2 Statistical Profiling Extension") Signed-off-by: Nicholas Mc Guire [will: reworded error message] Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_spe_pmu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index 54ec278d2fc4..e1a77b2de78a 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -927,6 +927,11 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu) idx = atomic_inc_return(&pmu_idx); name = devm_kasprintf(dev, GFP_KERNEL, "%s_%d", PMUNAME, idx); + if (!name) { + dev_err(dev, "failed to allocate name for pmu %d\n", idx); + return -ENOMEM; + } + return perf_pmu_register(&spe_pmu->pmu, name, -1); } -- 2.19.1