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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 DD360C432BE for ; Wed, 1 Sep 2021 08:47:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA92361056 for ; Wed, 1 Sep 2021 08:47:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241819AbhIAIso (ORCPT ); Wed, 1 Sep 2021 04:48:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:41206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237776AbhIAIsn (ORCPT ); Wed, 1 Sep 2021 04:48:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3241360C3E; Wed, 1 Sep 2021 08:47:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630486067; bh=hjee9ZpGoWPOZKrOYPxylcSqrwnR6DCr+65oiCiWKxk=; h=From:To:Cc:Subject:Date:From; b=AG9epuMgTczoC9rKJNkEVF2m1JBwRoOcHa/wrlM/KNNeS9sjrt6OWdLG2aYJieMRQ xT19VkF8XU8Ji/sZUKIBO25P4YG7E+P1r8qS4jWJ8BWynMn9yh2An6kH/t0mLzrdrg aznFn8UU0KKul6xrHaFF4ZkHjXkYqCA1nb0nnThj4YuPkAavob6FyBPragun7w9Xo0 U6OjYL27AACfAp53p5+XYQAwfp2qOypB/cKQl0mduyLwN5NJqNDx76R5FDq7EaifHR w5mVSCYRF0BwfMXIASQl1Il6jSKXwM6SsNBKXxZHKROLphw8gKb+RivL10oPm3obkF RMIQ/ng6olQaw== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Thara Gopinath , Bjorn Andersson , Andy Gross , linux-arm-msm@vger.kernel.org Subject: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name Date: Wed, 1 Sep 2021 10:47:32 +0200 Message-Id: <20210901084732.943248-1-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Registering an IRQ requires the string buffer containing the name to remain allocated, as the name is not copied into another buffer. So let's add a irq_name field to the data struct instead, which is guaranteed to have the appropriate lifetime. Cc: Thara Gopinath Cc: Bjorn Andersson Cc: Andy Gross Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Ard Biesheuvel --- I'm not following msm development closely, so apologies if this was already fixed, or if this is not based on the right tree. This fixes a crash on my Yoga C630 when reading /proc/interrupts. drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c index 3cc27d9e2ed1..6613228fe68c 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -44,6 +44,7 @@ struct qcom_cpufreq_data { /* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */ spinlock_t throttle_lock; int throttle_irq; + char irq_name[15]; bool cancel_throttle; }; @@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index) { struct qcom_cpufreq_data *data = policy->driver_data; struct platform_device *pdev = cpufreq_get_driver_data(); - char irq_name[15]; int ret; /* @@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index) spin_lock_init(&data->throttle_lock); INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll); - snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu); + snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu); ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq, - IRQF_ONESHOT, irq_name, data); + IRQF_ONESHOT, data->irq_name, data); if (ret) { - dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret); + dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret); return 0; } -- 2.30.2 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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,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 00D33C432BE for ; Wed, 1 Sep 2021 09:39:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C72C861026 for ; Wed, 1 Sep 2021 09:39:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C72C861026 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=0AMAQNjMJmShLj8yXkNRSwp2+gDdGJ46xkwBonq2PlM=; b=L5Vtbp915i6+xx tLQdT7Yxd9ofmFPK9vmAQrQopSqPagQWt/IKUZ67D2Caz+OFgLCwbJFG9JU+lszXADX+ZacEm8Fm/ tvQ8uK7/tTyr7A6W0REbiZl6TfOkMeEaI77iJHVOJIQTyDueIa0xTChReXUrqhKg505vNRSIZbJ1Z hmSRUmXtgORkSZwiZZz56Sy32LY7AkmYNaIgqobB4OMI5fLXcr7bNtYzpy6J+EKbsWx3uheZhGVNH UWV41t/v2e4MsLawA/AP/vJZYMQW/S/WvcpyndwAxbHgjYe1xh+0d2EMwvD1NKQuhfZ6vW/z4aXMO G8W6OjhgtJwoOla8EzsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLMg7-004vwG-Fw; Wed, 01 Sep 2021 09:37:07 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLLuN-004eVX-VT for linux-arm-kernel@lists.infradead.org; Wed, 01 Sep 2021 08:47:49 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3241360C3E; Wed, 1 Sep 2021 08:47:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630486067; bh=hjee9ZpGoWPOZKrOYPxylcSqrwnR6DCr+65oiCiWKxk=; h=From:To:Cc:Subject:Date:From; b=AG9epuMgTczoC9rKJNkEVF2m1JBwRoOcHa/wrlM/KNNeS9sjrt6OWdLG2aYJieMRQ xT19VkF8XU8Ji/sZUKIBO25P4YG7E+P1r8qS4jWJ8BWynMn9yh2An6kH/t0mLzrdrg aznFn8UU0KKul6xrHaFF4ZkHjXkYqCA1nb0nnThj4YuPkAavob6FyBPragun7w9Xo0 U6OjYL27AACfAp53p5+XYQAwfp2qOypB/cKQl0mduyLwN5NJqNDx76R5FDq7EaifHR w5mVSCYRF0BwfMXIASQl1Il6jSKXwM6SsNBKXxZHKROLphw8gKb+RivL10oPm3obkF RMIQ/ng6olQaw== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Thara Gopinath , Bjorn Andersson , Andy Gross , linux-arm-msm@vger.kernel.org Subject: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name Date: Wed, 1 Sep 2021 10:47:32 +0200 Message-Id: <20210901084732.943248-1-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210901_014748_099586_4D841EAC X-CRM114-Status: GOOD ( 13.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Registering an IRQ requires the string buffer containing the name to remain allocated, as the name is not copied into another buffer. So let's add a irq_name field to the data struct instead, which is guaranteed to have the appropriate lifetime. Cc: Thara Gopinath Cc: Bjorn Andersson Cc: Andy Gross Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Ard Biesheuvel --- I'm not following msm development closely, so apologies if this was already fixed, or if this is not based on the right tree. This fixes a crash on my Yoga C630 when reading /proc/interrupts. drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c index 3cc27d9e2ed1..6613228fe68c 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -44,6 +44,7 @@ struct qcom_cpufreq_data { /* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */ spinlock_t throttle_lock; int throttle_irq; + char irq_name[15]; bool cancel_throttle; }; @@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index) { struct qcom_cpufreq_data *data = policy->driver_data; struct platform_device *pdev = cpufreq_get_driver_data(); - char irq_name[15]; int ret; /* @@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index) spin_lock_init(&data->throttle_lock); INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll); - snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu); + snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu); ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq, - IRQF_ONESHOT, irq_name, data); + IRQF_ONESHOT, data->irq_name, data); if (ret) { - dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret); + dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret); return 0; } -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel