public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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 v3 1/4] usb: typec: ucsi: Fix null pointer dereference in trace
Date: Fri,  3 May 2024 00:39:17 +0000	[thread overview]
Message-ID: <20240503003920.1482447-2-jthies@google.com> (raw)
In-Reply-To: <20240503003920.1482447-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. When CONFIG_TYPEC_DP_ALTMODE is not enabled
ucsi_register_displayport returns NULL which causese a NULL pointer
dereference in trace. Rather than return NULL, call
typec_port_register_altmode to register DisplayPort alternate mode
as a non-controllable mode when CONFIG_TYPEC_DP_ALTMODE is not enabled.

Reviewed-by: Jameson Thies <jthies@google.com>
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
Changes in V3:
- Returns typec_port_register_altmode call from
ucsi_register_displayport when CONFIG_TYPEC_DP_ALTMODE is not enabled.

Changes in V2:
- Checks for error response from ucsi_register_displayport when
registering DisplayPort alternate mode.

 drivers/usb/typec/ucsi/ucsi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index c4d103db9d0f8..f66224a270bc6 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 typec_port_register_altmode(con->port, desc);
 }
 
 static inline void
-- 
2.45.0.rc1.225.g2a3ae87e7f-goog


  reply	other threads:[~2024-05-03  0:39 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-03  0:39 [PATCH v3 0/4] usb: typec: ucsi: Update UCSI alternate mode Jameson Thies
2024-05-03  0:39 ` Jameson Thies [this message]
2024-05-03  1:18   ` [PATCH v3 1/4] usb: typec: ucsi: Fix null pointer dereference in trace Benson Leung
2024-05-03 15:35   ` Markus Elfring
2024-05-03 19:05     ` Jameson Thies
2024-05-04  5:12       ` [v3 " Markus Elfring
2024-05-04  7:24         ` Greg Kroah-Hartman
2024-05-06 10:03   ` [PATCH v3 " Heikki Krogerus
2024-05-10  9:35     ` Greg KH
2024-05-10 17:47       ` Jameson Thies
2024-05-03  0:39 ` [PATCH v3 2/4] usb: typec: Update sysfs when setting ops Jameson Thies
2024-05-03  0:39 ` [PATCH v3 3/4] usb: typec: ucsi: Delay alternate mode discovery Jameson Thies
2024-05-03  0:39 ` [PATCH v3 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=20240503003920.1482447-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