From: Ma Ke <make24@iscas.ac.cn>
To: heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org,
utkarsh.h.patel@intel.com, abhishekpandit@chromium.org,
andriy.shevchenko@linux.intel.com, make24@iscas.ac.cn,
kyletso@google.com
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: [PATCH v2] usb: typec: ucsi: Fix NULL pointer dereference in ucsi_displayport_vdm()
Date: Tue, 23 Jul 2024 22:13:44 +0800 [thread overview]
Message-ID: <20240723141344.1331641-1-make24@iscas.ac.cn> (raw)
When dp->con->partner is an error, a NULL pointer dereference may occur.
Add a check for dp->con->partner to avoid dereferencing a NULL pointer.
Cc: stable@vger.kernel.org
Fixes: 372adf075a43 ("usb: typec: ucsi: Determine common SVDM Version")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
---
Changes in v2:
- added Cc stable line;
- fixed a typo.
---
drivers/usb/typec/ucsi/displayport.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c
index 420af5139c70..ecc706e0800d 100644
--- a/drivers/usb/typec/ucsi/displayport.c
+++ b/drivers/usb/typec/ucsi/displayport.c
@@ -222,6 +222,8 @@ static int ucsi_displayport_vdm(struct typec_altmode *alt,
switch (cmd_type) {
case CMDT_INIT:
if (PD_VDO_SVDM_VER(header) < svdm_version) {
+ if (IS_ERR_OR_NULL(dp->con->partner))
+ break;
typec_partner_set_svdm_version(dp->con->partner, PD_VDO_SVDM_VER(header));
svdm_version = PD_VDO_SVDM_VER(header);
}
--
2.25.1
next reply other threads:[~2024-07-23 14:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 14:13 Ma Ke [this message]
2024-07-23 14:21 ` [PATCH v2] usb: typec: ucsi: Fix NULL pointer dereference in ucsi_displayport_vdm() Dmitry Baryshkov
2024-07-23 17:33 ` Greg KH
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=20240723141344.1331641-1-make24@iscas.ac.cn \
--to=make24@iscas.ac.cn \
--cc=abhishekpandit@chromium.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=kyletso@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=utkarsh.h.patel@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