[PATCH v2 1/4] phy: qcom-ufs: Don't kfree devres resource

From	Bjorn Andersson <bjorn.andersson@linaro.org>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/4] phy: qcom-ufs: Don't kfree devres resource
Date	2017-01-23 06:20 +0100
Message-ID	<t2FcR-2eh-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Upon failing to acquire regulator supplies the qcom-ufs driver calls
kfree() on the devm allocated memory used to store the name of the
regulator, leading to devres corruption.

Rather than switching to using the appropriate free function the patch
acknowledge the fact that "name" is always a constant string and we
don't actually need to create a local copy of it, but rather just
reference the constant string.

Fixes: add78fc05702 ("phy: qcom-ufs: Use devm sibling of kstrdup for regulator names")
Cc: stable@vger.kernel.org
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

Changes since v1:
- Added fixes and Cc: stable@
- Added Subhash's reviewed-by

 drivers/phy/phy-qcom-ufs.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index c69568b8543d..4d7f3c018223 100644
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -217,12 +217,7 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev,
 
 	char prop_name[MAX_PROP_NAME];
 
-	vreg->name = devm_kstrdup(dev, name, GFP_KERNEL);
-	if (!vreg->name) {
-		err = -ENOMEM;
-		goto out;
-	}
-
+	vreg->name = name;
 	vreg->reg = devm_regulator_get(dev, name);
 	if (IS_ERR(vreg->reg)) {
 		err = PTR_ERR(vreg->reg);
@@ -265,8 +260,6 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev,
 	}
 
 out:
-	if (err)
-		kfree(vreg->name);
 	return err;
 }
 
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/4] phy: qcom-ufs: Don't kfree devres resource Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-01-23 06:20 +0100
  [PATCH v2 4/4] phy: qcom-ufs: Suppress extraneous logging Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-01-23 06:20 +0100
    Re: [PATCH v2 4/4] phy: qcom-ufs: Suppress extraneous logging Kishon Vijay Abraham I <kishon@ti.com> - 2017-01-26 16:30 +0100

csiph-web