From: Benson Leung <bleung@google.com>
To: Ma Ke <make24@iscas.ac.cn>
Cc: heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org,
dmitry.baryshkov@linaro.org, bleung@chromium.org,
utkarsh.h.patel@intel.com, abhishekpandit@chromium.org,
kyletso@google.com, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, jthies@google.com
Subject: Re: [PATCH] usb: typec: ucsi: Fix NULL pointer dereference in ucsi_displayport_vdm()
Date: Tue, 23 Jul 2024 13:41:55 +0000 [thread overview]
Message-ID: <Zp-zI8FCg98IYRMI@google.com> (raw)
In-Reply-To: <20240723133230.1325392-1-make24@iscas.ac.cn>
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
Hi Ma Ke,
On Tue, Jul 23, 2024 at 09:32:30PM +0800, Ma Ke wrote:
> 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.
>
> Fixes: 372adf075a43 ("usb: typec: ucsi: Determine common SVDM Version")
> Signed-off-by: Ma Ke <make24@iscas.ac.cn>
> ---
> 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..eb7d3f97940a 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->parter))
It looks like you have a typo here.
s/parter/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
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2024-07-23 13:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 13:32 [PATCH] usb: typec: ucsi: Fix NULL pointer dereference in ucsi_displayport_vdm() Ma Ke
2024-07-23 13:41 ` Benson Leung [this message]
2024-07-23 13:44 ` 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=Zp-zI8FCg98IYRMI@google.com \
--to=bleung@google.com \
--cc=abhishekpandit@chromium.org \
--cc=bleung@chromium.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jthies@google.com \
--cc=kyletso@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=make24@iscas.ac.cn \
--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