Skip to contentSkip to conversation

driver core: Fix size calculation of symlink name for devlink_(add|remove)_symlinks()

PATCH Superseded Zijun Hu 2 participants 3 messages Jul 9, 2024 – Jul 10, 2024 Driver core

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Zijun Hu

author
#0 lore raw

PATCH v2 1/1 driver core: Fix size calculation of symlink name for devlink_(add|remove)_symlinks()

From: Zijun Hu <[email protected]>

devlink_(add|remove)_symlinks() kzalloc() memory to save symlink name for both supplier and consumer, but do not explicitly take into account consumer's prefix "consumer:", so cause wrong algorithm for calculating memory size, fixed by taking into account consumer's prefix as well.

---
Changes in v2:
- Correct commit message and add inline comments
- Remove fix tag
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 drivers/base/core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/base/core.c +6 -2
index 2b4c0624b704..51209db7ff84 100644
@@ -572,7 +572,11 @@ static int devlink_add_symlinks(struct device *dev)
 	len = max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)),
 		  strlen(dev_bus_name(con)) + strlen(dev_name(con)));
 	len += strlen(":");
-	len += strlen("supplier:") + 1;
+	/*
+	 * we kzalloc() memory for symlink name of both supplier and
+	 * consumer, so explicitly take into account both prefix.
+	 */
+	len += max(strlen("supplier:"), strlen("consumer:")) + 1;
 	buf = kzalloc(len, GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
@@ -623,7 +627,7 @@ static void devlink_remove_symlinks(struct device *dev)
 	len = max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)),
 		  strlen(dev_bus_name(con)) + strlen(dev_name(con)));
 	len += strlen(":");
-	len += strlen("supplier:") + 1;
+	len += max(strlen("supplier:"), strlen("consumer:")) + 1;
 	buf = kzalloc(len, GFP_KERNEL);
 	if (!buf) {
 		WARN(1, "Unable to properly free device link symlinks!\n");

---
base-commit: c6653f49e4fd3b0d52c12a1fc814d6c5b234ea15
change-id: 20240707-devlink_fix-0fa46dedfe95

Best regards,

Signature · 1 line
Zijun Hu <[email protected]>
#1 lore raw
Quoted 7 lines · Zijun Hu

From: Zijun Hu <[email protected]>

devlink_(add|remove)_symlinks() kzalloc() memory to save symlink name for both supplier and consumer, but do not explicitly take into account consumer's prefix "consumer:", so cause wrong algorithm for calculating memory size, fixed by taking into account consumer's prefix as well.

Again, this makes it sound like you are fixing some bug. No "wrong algorithm" is happening here. You are improving readability. So, just say that?

-Saravana

Quoted 46 lines

---
Changes in v2:
- Correct commit message and add inline comments
- Remove fix tag
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 drivers/base/core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/base/core.c +6 -3
index 2b4c0624b704..51209db7ff84 100644
@@ -572,7 +572,11 @@ static int devlink_add_symlinks(struct device *dev)
        len = max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)),
                  strlen(dev_bus_name(con)) + strlen(dev_name(con)));
        len += strlen(":");
-       len += strlen("supplier:") + 1;
+       /*
+        * we kzalloc() memory for symlink name of both supplier and
+        * consumer, so explicitly take into account both prefix.
+        */
+       len += max(strlen("supplier:"), strlen("consumer:")) + 1;
        buf = kzalloc(len, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
@@ -623,7 +627,7 @@ static void devlink_remove_symlinks(struct device *dev)
        len = max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)),
                  strlen(dev_bus_name(con)) + strlen(dev_name(con)));
        len += strlen(":");
-       len += strlen("supplier:") + 1;
+       len += max(strlen("supplier:"), strlen("consumer:")) + 1;
        buf = kzalloc(len, GFP_KERNEL);
        if (!buf) {
                WARN(1, "Unable to properly free device link symlinks!\n");
 
---

base-commit: c6653f49e4fd3b0d52c12a1fc814d6c5b234ea15
change-id: 20240707-devlink_fix-0fa46dedfe95

Best regards,
--
Zijun Hu <[email protected]>

author
#2 lore raw
Quoted 4 lines · Saravana Kannan
Quoted 3 lines · Zijun Hu

From: Zijun Hu <[email protected]>

Quoted 9 lines
Quoted 4 lines

devlink_(add|remove)_symlinks() kzalloc() memory to save symlink name for both supplier and consumer, but do not explicitly take into account consumer's prefix "consumer:", so cause wrong algorithm for calculating memory size, fixed by taking into account consumer's prefix as well.

Again, this makes it sound like you are fixing some bug. No "wrong algorithm" is happening here. You are improving readability. So, just say that?

okay, thanks for code review. what about below comments?

devlink_(add|remove)_symlinks() kzalloc() memory to save symlink name for both supplier and consumer, but do not explicitly take into account consumer's prefix "consumer:", so cause disadvantages listed below:
1) it seems wrong for the algorithm to calculate memory size
2) readers maybe need to count characters one by one of both prefix strings to confirm calculated memory size
3) it is relatively easy to introduce new bug if any prefix string is modified in future
solved by taking into account consumer's prefix as well.

you maybe correct it, i would like to use that corrected.

Quoted 48 lines

-Saravana

Quoted 46 lines

---
Changes in v2:
- Correct commit message and add inline comments
- Remove fix tag
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 drivers/base/core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/base/core.c +6 -3
index 2b4c0624b704..51209db7ff84 100644
@@ -572,7 +572,11 @@ static int devlink_add_symlinks(struct device *dev)
        len = max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)),
                  strlen(dev_bus_name(con)) + strlen(dev_name(con)));
        len += strlen(":");
-       len += strlen("supplier:") + 1;
+       /*
+        * we kzalloc() memory for symlink name of both supplier and
+        * consumer, so explicitly take into account both prefix.
+        */
+       len += max(strlen("supplier:"), strlen("consumer:")) + 1;
        buf = kzalloc(len, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
@@ -623,7 +627,7 @@ static void devlink_remove_symlinks(struct device *dev)
        len = max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)),
                  strlen(dev_bus_name(con)) + strlen(dev_name(con)));
        len += strlen(":");
-       len += strlen("supplier:") + 1;
+       len += max(strlen("supplier:"), strlen("consumer:")) + 1;
        buf = kzalloc(len, GFP_KERNEL);
        if (!buf) {
                WARN(1, "Unable to properly free device link symlinks!\n");
 
---

base-commit: c6653f49e4fd3b0d52c12a1fc814d6c5b234ea15
change-id: 20240707-devlink_fix-0fa46dedfe95

Best regards,
--
Zijun Hu <[email protected]>