Skip to contentSkip to conversation

Patch "phy: qcom-ufs: Don't kfree devres resource" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

phy: qcom-ufs: Don't kfree devres resource

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
phy-qcom-ufs-don-t-kfree-devres-resource.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e7d5e412160c2143de1f818668774b33b3cdab0b Mon Sep 17 00:00:00 2001

From: Bjorn Andersson <[email protected]>
Date: Sun, 22 Jan 2017 13:17:46 -0800
Subject: phy: qcom-ufs: Don't kfree devres resource

From: Bjorn Andersson <[email protected]>

commit e7d5e412160c2143de1f818668774b33b3cdab0b upstream.

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")
---
 drivers/phy/phy-qcom-ufs.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/phy/phy-qcom-ufs.c +1 -8
@@ -217,12 +217,7 @@ static int __ufs_qcom_phy_init_vreg(stru
 
 	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(stru
 	}
 
 out:
-	if (err)
-		kfree(vreg->name);
 	return err;
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/phy-qcom-ufs-don-t-kfree-devres-resource.patch