From patchwork Sat Oct 15 13:04:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Parent X-Patchwork-Id: 2936 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp634351wrs; Sat, 15 Oct 2022 06:10:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5fGMWx+dTOomMB7u6uDD8hjtH9EsEJsjLnSNjygRP3yqYaUbKse1RRX6qsfPTIVB4KDXcH X-Received: by 2002:aa7:84c1:0:b0:563:d2c:c37c with SMTP id x1-20020aa784c1000000b005630d2cc37cmr2889721pfn.24.1665839426901; Sat, 15 Oct 2022 06:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665839426; cv=none; d=google.com; s=arc-20160816; b=Y1qeuM0puTnJAksZ7W9ExV46O9fPwPUJYpVvwqxU4psA9Y326+nqcb7rN2SnkfxykT 8e+gcAdH8l8vW3z013vNrTeH7aDT/opDcHS3mLe9zZr0y1+nZxlYpoQk5cZOYNcSwJxH 5yql/NPcYcfvT0P/viVcWKGrk81dR08/MGtKftHgwF244B6dxESjnYIo9jiWYLDvuO1c F/sA+DjPOzHtvMISmAa4rlYoYMlPuI7HJoD87zsmvfHEfDIkMdTbYYUoQxa8h+ntvnEZ PuqnJCkYtQReONWt614n1PnWwz07M8+0EleD2dWtX4zRZaLdGHqiHAxa2O/k+iub/nqt E2IA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=M3YfUt++W8dDaqgtSWE1khIACcQPCyEYMQHXrvEQmhs=; b=D2uozKkQsG81xZogeNfbivkLS7vXoZwhXVBeqUQab71mGSkr9DEPah5GYmDHI+dreZ K0CRkzvaJUJ3kWug6DujTy4p1FIByV9sRSGVlNU+dbOJD49+1H2YkBxdo+YroAbwWXN1 o2+rHRqhMFmaI03eRuSZoQ0opsvIn4nfG0jQgOhk+3cN2KaOZOGLFs1La0gqFf+NIBFK ywBS95VWTjA6ngoMTfnPOnQVqWZX7+NpCHtQ0MC8SWV6cGB62RbtJ8ZtInoGaOisX0BN YnobHL9RH6jqRhyRDRtVaGzbjebhr7c+ocG30lFBZCcntJ7B7R33S81swcdo0khofdwi nrkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y4wbOjgx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k9-20020a056a00134900b00565eb80af7fsi5785972pfu.343.2022.10.15.06.10.14; Sat, 15 Oct 2022 06:10:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y4wbOjgx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbiJONEr (ORCPT + 99 others); Sat, 15 Oct 2022 09:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229766AbiJONEo (ORCPT ); Sat, 15 Oct 2022 09:04:44 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49C3413D64 for ; Sat, 15 Oct 2022 06:04:42 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id l14-20020a05600c1d0e00b003c6ecc94285so1393454wms.1 for ; Sat, 15 Oct 2022 06:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=M3YfUt++W8dDaqgtSWE1khIACcQPCyEYMQHXrvEQmhs=; b=Y4wbOjgx2lEWRAFVJ3dc7xv73XQApHAV+DYnGZ3iqL/BL4RdytNcTox/0ZvbdGiC0Z MTGU7zq3js0WGVaMIoB3g8iMnaYBUuz507VAFbttX8TVPaMjEwPclvCjsf4mF8fxZo94 J5ROzk0h+ykzWxTGS3ld6a06kDMuClfztt4hfdXpSheURLY7Pf/5UTVagqoy9AJj1iCp oPRSX3KKATin472tvlIHB9qGC2sPKF/OgAICsBpXZilaqZAzbzZGmLfqdQVG1hTGdsXk LaRGWd+4I1EZI4H15ZVj0UJhBuBKgpeU9k8L5YrSObzI6UaqolYZKIuzWtlEsreeHc1J 29cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M3YfUt++W8dDaqgtSWE1khIACcQPCyEYMQHXrvEQmhs=; b=er4SA41A3DwHSkeBY6jA6ptufnY+8SFVtPbOKAcr4Az5O0o+whu/tl0dlfonFKEw2C ShgbLAzRd7V9JAHxVVEfb9IB4sv9FLZiTRUi5bcnWpkvY7mkyAT4zURGQ7hJno9PP8Cu Zn8TXkoV4Ci0s8Y8aZZrma0r4K4j7DeD2vJJYDNMll+fvt9k2i+sgm1PQaCXbJfdYNvs LjDm9SONwaa8ZA9EsTvJwZj9R5Hz27JFe16vDjgpn/CJrJcUJAj0Z5abZZUG/fYOAQZO hiTo2P3FHvLjSMR9mTPrgXkWt4mdJcLVvs6mLk6W8NwSTin2uCBdp3sssLKZkoi6AbOs yZXw== X-Gm-Message-State: ACrzQf3aNPLm6lhHMGVQ8g9jGlm4kX0ysUzWGnd21M2knbBmtoCD0cWi 0zdp01aZ8UfJRiUbI+AqIJ0Tng== X-Received: by 2002:a05:600c:21c5:b0:3c6:ec59:5180 with SMTP id x5-20020a05600c21c500b003c6ec595180mr3717470wmj.130.1665839080533; Sat, 15 Oct 2022 06:04:40 -0700 (PDT) Received: from radium.lan ([88.160.162.107]) by smtp.gmail.com with ESMTPSA id r12-20020adff10c000000b00225239d9265sm4151282wro.74.2022.10.15.06.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Oct 2022 06:04:40 -0700 (PDT) From: Fabien Parent To: ilia.lin@kernel.org, agross@kernel.org, andersson@kernel.org, rafael@kernel.org, viresh.kumar@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, Fabien Parent Subject: [PATCH v2 1/3] cpufreq: qcom: fix memory leak in error path Date: Sat, 15 Oct 2022 15:04:22 +0200 Message-Id: <20221015130424.1923706-1-fabien.parent@linaro.org> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746759099794084418?= X-GMAIL-MSGID: =?utf-8?q?1746759242756568101?= If for some reason the speedbin length is incorrect, then there is a memory leak in the error path because we never free the speedbin buffer. This commit fixes the error path to always free the speedbin buffer. Fixes: a8811ec764f9 ("cpufreq: qcom: Add support for krait based socs") Signed-off-by: Fabien Parent --- v2: Added missing "Fixes" tag drivers/cpufreq/qcom-cpufreq-nvmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c index 863548f59c3e..3bd38acde4b9 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -213,6 +213,7 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, int speed = 0, pvs = 0, pvs_ver = 0; u8 *speedbin; size_t len; + int ret = 0; speedbin = nvmem_cell_read(speedbin_nvmem, &len); @@ -230,7 +231,8 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, break; default: dev_err(cpu_dev, "Unable to read nvmem data. Defaulting to 0!\n"); - return -ENODEV; + ret = -ENODEV; + goto len_error; } snprintf(*pvs_name, sizeof("speedXX-pvsXX-vXX"), "speed%d-pvs%d-v%d", @@ -238,8 +240,9 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, drv->versions = (1 << speed); +len_error: kfree(speedbin); - return 0; + return ret; } static const struct qcom_cpufreq_match_data match_data_kryo = {