From: Jameson Thies <jthies@google.com>
To: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org
Cc: jthies@google.com, pmalani@chromium.org, bleung@google.com,
abhishekpandit@chromium.org, andersson@kernel.org,
dmitry.baryshkov@linaro.org, fabrice.gasnier@foss.st.com,
gregkh@linuxfoundation.org, hdegoede@redhat.com,
neil.armstrong@linaro.org, rajaram.regupathy@intel.com,
saranya.gopal@intel.com, linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/4] usb: typec: ucsi: Fix null deref in trace
Date: Wed, 24 Apr 2024 01:48:18 +0000 [thread overview]
Message-ID: <20240424014821.4154159-2-jthies@google.com> (raw)
In-Reply-To: <20240424014821.4154159-1-jthies@google.com>
From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
ucsi_register_altmode checks IS_ERR on returned pointer and treats
NULL as valid. This results in a null deref when
trace_ucsi_register_altmode is called. Return an error from
ucsi_register_displayport when it is not supported and register the
altmode with typec_port_register_altmode.
Reviewed-by: Jameson Thies <jthies@google.com>
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
Changes in V2:
- Checks for error response from ucsi_register_displayport when
registering DisplayPort alternate mode.
drivers/usb/typec/ucsi/ucsi.c | 3 +++
drivers/usb/typec/ucsi/ucsi.h | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index cb52e7b0a2c5c..f3b413f94fd28 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -361,6 +361,9 @@ static int ucsi_register_altmode(struct ucsi_connector *con,
switch (desc->svid) {
case USB_TYPEC_DP_SID:
alt = ucsi_register_displayport(con, override, i, desc);
+ if (IS_ERR(alt) && PTR_ERR(alt) == -EOPNOTSUPP)
+ alt = typec_port_register_altmode(con->port, desc);
+
break;
case USB_TYPEC_NVIDIA_VLINK_SID:
if (desc->vdo == USB_TYPEC_NVIDIA_VLINK_DBG_VDO)
diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index c4d103db9d0f8..c663dce0659ee 100644
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -496,7 +496,7 @@ ucsi_register_displayport(struct ucsi_connector *con,
bool override, int offset,
struct typec_altmode_desc *desc)
{
- return NULL;
+ return ERR_PTR(-EOPNOTSUPP);
}
static inline void
--
2.44.0.769.g3c40516874-goog
next prev parent reply other threads:[~2024-04-24 1:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 1:48 [PATCH v2 0/4] usb: typec: ucsi: Update UCSI alternate mode Jameson Thies
2024-04-24 1:48 ` Jameson Thies [this message]
2024-04-24 2:06 ` [PATCH v2 1/4] usb: typec: ucsi: Fix null deref in trace Dmitry Baryshkov
2024-04-25 0:00 ` Abhishek Pandit-Subedi
2024-04-25 5:30 ` Christian A. Ehrhardt
2024-04-25 8:51 ` Markus Elfring
2024-04-25 19:35 ` Greg Kroah-Hartman
2024-04-30 0:43 ` Jameson Thies
2024-04-30 1:00 ` Dmitry Baryshkov
2024-04-30 1:14 ` Jameson Thies
2024-04-30 7:17 ` Dan Carpenter
2024-05-02 22:47 ` Jameson Thies
2024-05-03 12:03 ` Dan Carpenter
2024-04-24 1:48 ` [PATCH v2 2/4] usb: typec: Update sysfs when setting ops Jameson Thies
2024-04-24 1:48 ` [PATCH v2 3/4] usb: typec: ucsi: Delay alternate mode discovery Jameson Thies
2024-04-24 1:48 ` [PATCH v2 4/4] usb: typec: ucsi: Always set number of alternate modes Jameson Thies
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=20240424014821.4154159-2-jthies@google.com \
--to=jthies@google.com \
--cc=abhishekpandit@chromium.org \
--cc=andersson@kernel.org \
--cc=bleung@google.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=fabrice.gasnier@foss.st.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=pmalani@chromium.org \
--cc=rajaram.regupathy@intel.com \
--cc=saranya.gopal@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 read-only IMAP folder(s) and NNTP newsgroup(s).