From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Daniel Scally <djrscally@gmail.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Hans de Goede <hdegoede@redhat.com>
Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: [PATCH v5 3/7] usb: typec: mux: Check dev_set_name() return value
Date: Fri, 22 Apr 2022 15:23:47 -0700 [thread overview]
Message-ID: <20220422222351.1297276-4-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20220422222351.1297276-1-bjorn.andersson@linaro.org>
It's possible that dev_set_name() returns -ENOMEM, catch and handle this.
Fixes: 3370db35193b ("usb: typec: Registering real device entries for the muxes")
Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Changes since v4:
- Added Fixes tag
drivers/usb/typec/mux.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index c8340de0ed49..d2aaf294b649 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -131,8 +131,11 @@ typec_switch_register(struct device *parent,
sw->dev.class = &typec_mux_class;
sw->dev.type = &typec_switch_dev_type;
sw->dev.driver_data = desc->drvdata;
- dev_set_name(&sw->dev, "%s-switch",
- desc->name ? desc->name : dev_name(parent));
+ ret = dev_set_name(&sw->dev, "%s-switch", desc->name ? desc->name : dev_name(parent));
+ if (ret) {
+ put_device(&sw->dev);
+ return ERR_PTR(ret);
+ }
ret = device_add(&sw->dev);
if (ret) {
@@ -338,8 +341,11 @@ typec_mux_register(struct device *parent, const struct typec_mux_desc *desc)
mux->dev.class = &typec_mux_class;
mux->dev.type = &typec_mux_dev_type;
mux->dev.driver_data = desc->drvdata;
- dev_set_name(&mux->dev, "%s-mux",
- desc->name ? desc->name : dev_name(parent));
+ ret = dev_set_name(&mux->dev, "%s-mux", desc->name ? desc->name : dev_name(parent));
+ if (ret) {
+ put_device(&mux->dev);
+ return ERR_PTR(ret);
+ }
ret = device_add(&mux->dev);
if (ret) {
--
2.35.1
next prev parent reply other threads:[~2022-04-22 22:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 22:23 [PATCH v5 0/7] typec: mux: Introduce support for multiple USB TypeC muxes Bjorn Andersson
2022-04-22 22:23 ` [PATCH v5 1/7] device property: Add helper to match multiple connections Bjorn Andersson
2022-04-26 10:15 ` Andy Shevchenko
2022-05-06 18:21 ` Rafael J. Wysocki
2022-04-22 22:23 ` [PATCH v5 2/7] device property: Use multi-connection matchers for single case Bjorn Andersson
2022-04-22 22:23 ` Bjorn Andersson [this message]
2022-04-26 10:13 ` [PATCH v5 3/7] usb: typec: mux: Check dev_set_name() return value Andy Shevchenko
2022-04-22 22:23 ` [PATCH v5 4/7] usb: typec: mux: Introduce indirection Bjorn Andersson
2022-04-22 22:23 ` [PATCH v5 5/7] usb: typec: mux: Allow multiple mux_devs per mux Bjorn Andersson
2024-06-05 3:05 ` Frank Wang
2024-06-05 7:37 ` Frank Wang
2022-04-22 22:23 ` [PATCH v5 6/7] dt-bindings: usb: Add binding for fcs,fsa4480 Bjorn Andersson
2022-04-22 22:23 ` [PATCH v5 7/7] usb: typec: mux: Add On Semi fsa4480 driver Bjorn Andersson
2022-04-25 8:50 ` Heikki Krogerus
2022-04-27 13:38 ` [PATCH v5 0/7] typec: mux: Introduce support for multiple USB TypeC muxes Sakari Ailus
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=20220422222351.1297276-4-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=djrscally@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.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;
as well as URLs for NNTP newsgroup(s).