From: 胡连勤 <hulianqin@vivo.com>
To: Prashanth K <quic_prashk@quicinc.com>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: "quic_jjohnson@quicinc.com" <quic_jjohnson@quicinc.com>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
opensource.kernel <opensource.kernel@vivo.com>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
Michael Nazzareno Trimarchi <michael@amarulasolutions.com>
Subject: 答复: [PATCH v2] usb: gadget: u_serial: check Null pointer in EP callback
Date: Tue, 20 Aug 2024 10:52:47 +0000 [thread overview]
Message-ID: <TYUPR06MB621757ABDEF795FB39B912FED28D2@TYUPR06MB6217.apcprd06.prod.outlook.com> (raw)
In-Reply-To: <1a81f498-f7dd-86e6-74fa-fdeefad6a7b4@quicinc.com>
Hello linux community expert:
>> diff --git a/drivers/usb/gadget/function/u_serial.c
>> b/drivers/usb/gadget/function/u_serial.c
>> index b394105e55d6..65637d53bf02
>> --- a/drivers/usb/gadget/function/u_serial.c
>> +++ b/drivers/usb/gadget/function/u_serial.c
>> @@ -454,6 +454,14 @@ static void gs_read_complete(struct usb_ep *ep,
>> struct usb_request *req) {
>> struct gs_port *port = ep->driver_data;
>>
>> + /* When port is NULL, return to avoid panic. */
>> + if (!port)
>> + return;
>> +
>This doesn't protect the port from going to NULL right after the above the check. Since you mentioned gser_disconnect is making port to NULL, add the serial_port_lock to protect port (just like its done on gser_disconnect/suspend/resume). Something like this would do.
OK, it is more reasonable to modify it as follows, I will modify it again.
>diff --git a/drivers/usb/gadget/function/u_serial.c
>b/drivers/usb/gadget/function/u_serial.c
>index f975dc03a190..a33f8cd871ac 100644
>--- a/drivers/usb/gadget/function/u_serial.c
>+++ b/drivers/usb/gadget/function/u_serial.c
>@@ -451,10 +451,21 @@ static void gs_rx_push(struct work_struct *work)
>static void gs_read_complete(struct usb_ep *ep, struct usb_request *req) {
>- struct gs_port *port = ep->driver_data;
>+ struct gs_port *port;
>+ unsigned long flags;
>+
>+ spin_lock_irqsave(&serial_port_lock, flags);
>+ port = ep->driver_data;
>+
>+ if (!port) {
>+ spin_unlock_irqrestore(&serial_port_lock, flags);
>+ return;
>+ }
>- /* Queue all received data until the tty layer is ready for it. */
> spin_lock(&port->port_lock);
>+ spin_unlock(&serial_port_lock);
>+
>+ /* Queue all received data until the tty layer is ready for it.
>+ */
> list_add_tail(&req->list, &port->read_queue);
> schedule_delayed_work(&port->push, 0);
> spin_unlock(&port->port_lock);
>
>> /* Queue all received data until the tty layer is ready for it. */
>> spin_lock(&port->port_lock);
>> list_add_tail(&req->list, &port->read_queue); @@ -465,6 +473,14 @@
>> static void gs_write_complete(struct usb_ep *ep, struct usb_request
>> *req) {
>> struct gs_port *port = ep->driver_data;
>>
>> + /* When port is NULL, return to avoid panic. */
>> + if (!port)
>> + return;
>> +
>> spin_lock(&port->port_lock);
>> list_add(&req->list, &port->write_pool);
>> port->write_started--;
>Same here also
Thanks
next prev parent reply other threads:[~2024-08-20 10:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-20 9:29 胡连勤
2024-08-20 10:15 ` Prashanth K
2024-08-20 10:52 ` 胡连勤 [this message]
2024-08-20 11:51 ` gregkh
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=TYUPR06MB621757ABDEF795FB39B912FED28D2@TYUPR06MB6217.apcprd06.prod.outlook.com \
--to=hulianqin@vivo.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=michael@amarulasolutions.com \
--cc=opensource.kernel@vivo.com \
--cc=quic_jjohnson@quicinc.com \
--cc=quic_prashk@quicinc.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
all inboxes | Powered by JetHome®