* [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable()
@ 2024-02-02 15:42 Frank Li
2024-02-02 15:42 ` [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet Frank Li
2024-02-05 4:43 ` [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() Peter Chen
0 siblings, 2 replies; 5+ messages in thread
From: Frank Li @ 2024-02-02 15:42 UTC (permalink / raw)
To: rogerq
Cc: Frank.Li, felipe.balbi, gregkh, imx, linux-kernel, linux-usb,
pawell, peter.chen
...
cdns3_gadget_ep_free_request(&priv_ep->endpoint, &priv_req->request);
list_del_init(&priv_req->list);
...
'priv_req' actually free at cdns3_gadget_ep_free_request(). But
list_del_init() use priv_req->list after it.
[ 1542.642868][ T534] BUG: KFENCE: use-after-free read in __list_del_entry_valid+0x10/0xd4
[ 1542.642868][ T534]
[ 1542.653162][ T534] Use-after-free read at 0x000000009ed0ba99 (in kfence-#3):
[ 1542.660311][ T534] __list_del_entry_valid+0x10/0xd4
[ 1542.665375][ T534] cdns3_gadget_ep_disable+0x1f8/0x388 [cdns3]
[ 1542.671571][ T534] usb_ep_disable+0x44/0xe4
[ 1542.675948][ T534] ffs_func_eps_disable+0x64/0xc8
[ 1542.680839][ T534] ffs_func_set_alt+0x74/0x368
[ 1542.685478][ T534] ffs_func_disable+0x18/0x28
Move list_del_init() before cdns3_gadget_ep_free_request() to resolve this
problem.
Cc: <stable@vger.kernel.org>
Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
---
drivers/usb/cdns3/cdns3-gadget.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index aeca902ab6cc4..d6723d31fc6e2 100644
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -2540,11 +2540,11 @@ static int cdns3_gadget_ep_disable(struct usb_ep *ep)
while (!list_empty(&priv_ep->wa2_descmiss_req_list)) {
priv_req = cdns3_next_priv_request(&priv_ep->wa2_descmiss_req_list);
+ list_del_init(&priv_req->list);
kfree(priv_req->request.buf);
cdns3_gadget_ep_free_request(&priv_ep->endpoint,
&priv_req->request);
- list_del_init(&priv_req->list);
--priv_ep->wa2_counter;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet
2024-02-02 15:42 [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() Frank Li
@ 2024-02-02 15:42 ` Frank Li
2024-02-05 4:52 ` Peter Chen
2024-02-05 10:01 ` Roger Quadros
2024-02-05 4:43 ` [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() Peter Chen
1 sibling, 2 replies; 5+ messages in thread
From: Frank Li @ 2024-02-02 15:42 UTC (permalink / raw)
To: rogerq
Cc: Frank.Li, felipe.balbi, gregkh, imx, linux-kernel, linux-usb,
pawell, peter.chen
829 if (request->complete) {
830 spin_unlock(&priv_dev->lock);
831 usb_gadget_giveback_request(&priv_ep->endpoint,
832 request);
833 spin_lock(&priv_dev->lock);
834 }
835
836 if (request->buf == priv_dev->zlp_buf)
837 cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);
Driver append an additional zero packet request when queue a packet, which
length mod max packet size is 0. When transfer complete, run to line 831,
usb_gadget_giveback_request() will free this requestion. 836 condition is
true, so cdns3_gadget_ep_free_request() free this request again.
Log:
[ 1920.140696][ T150] BUG: KFENCE: use-after-free read in cdns3_gadget_giveback+0x134/0x2c0 [cdns3]
[ 1920.140696][ T150]
[ 1920.151837][ T150] Use-after-free read at 0x000000003d1cd10b (in kfence-#36):
[ 1920.159082][ T150] cdns3_gadget_giveback+0x134/0x2c0 [cdns3]
[ 1920.164988][ T150] cdns3_transfer_completed+0x438/0x5f8 [cdns3]
Add check at line 829, skip call usb_gadget_giveback_request() if it is
additional zero length packet request. Needn't call
usb_gadget_giveback_request() because it is allocated in this driver.
Cc: <stable@vger.kernel.org>
Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/usb/cdns3/cdns3-gadget.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index d6723d31fc6e2..fd1beb10bba72 100644
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -828,7 +828,11 @@ void cdns3_gadget_giveback(struct cdns3_endpoint *priv_ep,
return;
}
- if (request->complete) {
+ /*
+ * zlp request is appended by driver, needn't call usb_gadget_giveback_request() to notify
+ * gadget composite driver.
+ */
+ if (request->complete && request->buf != priv_dev->zlp_buf) {
spin_unlock(&priv_dev->lock);
usb_gadget_giveback_request(&priv_ep->endpoint,
request);
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable()
2024-02-02 15:42 [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() Frank Li
2024-02-02 15:42 ` [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet Frank Li
@ 2024-02-05 4:43 ` Peter Chen
1 sibling, 0 replies; 5+ messages in thread
From: Peter Chen @ 2024-02-05 4:43 UTC (permalink / raw)
To: Frank Li; +Cc: rogerq, felipe.balbi, gregkh, imx, linux-kernel, linux-usb,
pawell
On 24-02-02 10:42:16, Frank Li wrote:
> ...
> cdns3_gadget_ep_free_request(&priv_ep->endpoint, &priv_req->request);
> list_del_init(&priv_req->list);
> ...
>
> 'priv_req' actually free at cdns3_gadget_ep_free_request(). But
> list_del_init() use priv_req->list after it.
>
> [ 1542.642868][ T534] BUG: KFENCE: use-after-free read in __list_del_entry_valid+0x10/0xd4
> [ 1542.642868][ T534]
> [ 1542.653162][ T534] Use-after-free read at 0x000000009ed0ba99 (in kfence-#3):
> [ 1542.660311][ T534] __list_del_entry_valid+0x10/0xd4
> [ 1542.665375][ T534] cdns3_gadget_ep_disable+0x1f8/0x388 [cdns3]
> [ 1542.671571][ T534] usb_ep_disable+0x44/0xe4
> [ 1542.675948][ T534] ffs_func_eps_disable+0x64/0xc8
> [ 1542.680839][ T534] ffs_func_set_alt+0x74/0x368
> [ 1542.685478][ T534] ffs_func_disable+0x18/0x28
>
> Move list_del_init() before cdns3_gadget_ep_free_request() to resolve this
> problem.
>
> Cc: <stable@vger.kernel.org>
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> Reviewed-by: Roger Quadros <rogerq@kernel.org>
Acked-by: Peter Chen <peter.chen@kernel.org>
> ---
> drivers/usb/cdns3/cdns3-gadget.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> index aeca902ab6cc4..d6723d31fc6e2 100644
> --- a/drivers/usb/cdns3/cdns3-gadget.c
> +++ b/drivers/usb/cdns3/cdns3-gadget.c
> @@ -2540,11 +2540,11 @@ static int cdns3_gadget_ep_disable(struct usb_ep *ep)
>
> while (!list_empty(&priv_ep->wa2_descmiss_req_list)) {
> priv_req = cdns3_next_priv_request(&priv_ep->wa2_descmiss_req_list);
> + list_del_init(&priv_req->list);
>
> kfree(priv_req->request.buf);
> cdns3_gadget_ep_free_request(&priv_ep->endpoint,
> &priv_req->request);
> - list_del_init(&priv_req->list);
> --priv_ep->wa2_counter;
> }
>
> --
> 2.34.1
>
--
Thanks,
Peter Chen
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet
2024-02-02 15:42 ` [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet Frank Li
@ 2024-02-05 4:52 ` Peter Chen
2024-02-05 10:01 ` Roger Quadros
1 sibling, 0 replies; 5+ messages in thread
From: Peter Chen @ 2024-02-05 4:52 UTC (permalink / raw)
To: Frank Li; +Cc: rogerq, felipe.balbi, gregkh, imx, linux-kernel, linux-usb,
pawell
On 24-02-02 10:42:17, Frank Li wrote:
> 829 if (request->complete) {
> 830 spin_unlock(&priv_dev->lock);
> 831 usb_gadget_giveback_request(&priv_ep->endpoint,
> 832 request);
> 833 spin_lock(&priv_dev->lock);
> 834 }
> 835
> 836 if (request->buf == priv_dev->zlp_buf)
> 837 cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);
>
> Driver append an additional zero packet request when queue a packet, which
> length mod max packet size is 0. When transfer complete, run to line 831,
> usb_gadget_giveback_request() will free this requestion. 836 condition is
> true, so cdns3_gadget_ep_free_request() free this request again.
>
> Log:
>
> [ 1920.140696][ T150] BUG: KFENCE: use-after-free read in cdns3_gadget_giveback+0x134/0x2c0 [cdns3]
> [ 1920.140696][ T150]
> [ 1920.151837][ T150] Use-after-free read at 0x000000003d1cd10b (in kfence-#36):
> [ 1920.159082][ T150] cdns3_gadget_giveback+0x134/0x2c0 [cdns3]
> [ 1920.164988][ T150] cdns3_transfer_completed+0x438/0x5f8 [cdns3]
>
> Add check at line 829, skip call usb_gadget_giveback_request() if it is
> additional zero length packet request. Needn't call
> usb_gadget_giveback_request() because it is allocated in this driver.
>
> Cc: <stable@vger.kernel.org>
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
Acked-by: Peter Chen <peter.chen@kernel.org>
> ---
> drivers/usb/cdns3/cdns3-gadget.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> index d6723d31fc6e2..fd1beb10bba72 100644
> --- a/drivers/usb/cdns3/cdns3-gadget.c
> +++ b/drivers/usb/cdns3/cdns3-gadget.c
> @@ -828,7 +828,11 @@ void cdns3_gadget_giveback(struct cdns3_endpoint *priv_ep,
> return;
> }
>
> - if (request->complete) {
> + /*
> + * zlp request is appended by driver, needn't call usb_gadget_giveback_request() to notify
> + * gadget composite driver.
> + */
> + if (request->complete && request->buf != priv_dev->zlp_buf) {
> spin_unlock(&priv_dev->lock);
> usb_gadget_giveback_request(&priv_ep->endpoint,
> request);
> --
> 2.34.1
>
--
Thanks,
Peter Chen
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet
2024-02-02 15:42 ` [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet Frank Li
2024-02-05 4:52 ` Peter Chen
@ 2024-02-05 10:01 ` Roger Quadros
1 sibling, 0 replies; 5+ messages in thread
From: Roger Quadros @ 2024-02-05 10:01 UTC (permalink / raw)
To: Frank Li
Cc: felipe.balbi, gregkh, imx, linux-kernel, linux-usb, pawell,
peter.chen
On 02/02/2024 17:42, Frank Li wrote:
> 829 if (request->complete) {
> 830 spin_unlock(&priv_dev->lock);
> 831 usb_gadget_giveback_request(&priv_ep->endpoint,
> 832 request);
> 833 spin_lock(&priv_dev->lock);
> 834 }
> 835
> 836 if (request->buf == priv_dev->zlp_buf)
> 837 cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);
>
> Driver append an additional zero packet request when queue a packet, which
> length mod max packet size is 0. When transfer complete, run to line 831,
> usb_gadget_giveback_request() will free this requestion. 836 condition is
> true, so cdns3_gadget_ep_free_request() free this request again.
>
> Log:
>
> [ 1920.140696][ T150] BUG: KFENCE: use-after-free read in cdns3_gadget_giveback+0x134/0x2c0 [cdns3]
> [ 1920.140696][ T150]
> [ 1920.151837][ T150] Use-after-free read at 0x000000003d1cd10b (in kfence-#36):
> [ 1920.159082][ T150] cdns3_gadget_giveback+0x134/0x2c0 [cdns3]
> [ 1920.164988][ T150] cdns3_transfer_completed+0x438/0x5f8 [cdns3]
>
> Add check at line 829, skip call usb_gadget_giveback_request() if it is
> additional zero length packet request. Needn't call
> usb_gadget_giveback_request() because it is allocated in this driver.
>
> Cc: <stable@vger.kernel.org>
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-05 10:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-02 15:42 [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() Frank Li
2024-02-02 15:42 ` [PATCH v2 2/2] usb: cdns3: fix memory double free when handle zero packet Frank Li
2024-02-05 4:52 ` Peter Chen
2024-02-05 10:01 ` Roger Quadros
2024-02-05 4:43 ` [PATCH v2 1/2] usb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() Peter Chen
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 NNTP newsgroup(s).