From: Zijun Hu <zijun_hu@icloud.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Saravana Kannan <saravanak@google.com>
Cc: linux-kernel@vger.kernel.org, zijun_hu@icloud.com,
Zijun Hu <quic_zijuhu@quicinc.com>
Subject: [PATCH] driver core: Fix size calculation of symlink name for devlink_(add|remove)_symlinks()
Date: Sun, 07 Jul 2024 21:23:15 +0800 [thread overview]
Message-ID: <20240707-devlink_fix-v1-1-623acb431cd8@quicinc.com> (raw)
From: Zijun Hu <quic_zijuhu@quicinc.com>
devlink_(add|remove)_symlinks() wants to kzalloc() memory to save symlink
name for either supplier or consumer, but forget to consider consumer
prefix when calclulate memory size, fixed by considering prefix for both
supplier and consumer.
Fixes: 287905e68dd2 ("driver core: Expose device link details in sysfs")
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
---
drivers/base/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 2b4c0624b704..f14cfe5c97b7 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -572,7 +572,7 @@ 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;
+ len += max(strlen("supplier:"), strlen("consumer:")) + 1;
buf = kzalloc(len, GFP_KERNEL);
if (!buf)
return -ENOMEM;
@@ -623,7 +623,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 <quic_zijuhu@quicinc.com>
next reply other threads:[~2024-07-07 13:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-07 13:23 Zijun Hu [this message]
2024-07-08 22:43 ` Saravana Kannan
2024-07-09 1:04 ` quic_zijuhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240707-devlink_fix-v1-1-623acb431cd8@quicinc.com \
--to=zijun_hu@icloud.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_zijuhu@quicinc.com \
--cc=rafael@kernel.org \
--cc=saravanak@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®