ehci: Ensure that device is not NULL before calling usb_ep_get
PATCH 1/1 ehci: Ensure that device is not NULL before calling usb_ep_get
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64: hw/usb/core.c:734: usb_ep_get:
Assertion `dev != NULL' failed.
The call to usb_ep_get() originates from ehci_execute(). Analysis and debugging shows that p->queue->dev can indeed be NULL in this function. Add check for this condition and return an error if it is seen.
--- hw/usb/hcd-ehci.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/usb/hcd-ehci.c +5 -0
@@ -1348,6 +1348,11 @@ static int ehci_execute(EHCIPacket *p, const char *action)return -1 ; } +if (p->queue->dev ==NULL ) { +ehci_trace_guest_bug (p->queue->ehci,"No device attached to queue\n" ); +return -1 ; + } +if (get_field (p->qtd.token,QTD_TOKEN_TBYTES ) >BUFF_SIZE ) {ehci_trace_guest_bug (p->queue->ehci,"guest requested more bytes than allowed" );
Signature · 1 line
2.7.4
Quoted 10 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.
Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
Gerd, shouldn't we call usb_packet_cleanup() in ehci_reset() rather than ehci_finalize()? Then we shouldn't need this patch.
Quoted 22 lines
Signed-off-by Guenter Roeck <[email protected]>--- hw/usb/hcd-ehci.c | 5 +++++ 1 file changed, 5 insertions(+)hw/usb/hcd-ehci.c +5
-0@@ -1348,6 +1348,11 @@ static int ehci_execute(EHCIPacket *p, const char *action)return -1 ; } +if (p->queue->dev ==NULL ) { +ehci_trace_guest_bug (p->queue->ehci,"No device attached to queue\n" ); +return -1 ; + } +if (get_field (p->qtd.token,QTD_TOKEN_TBYTES ) >BUFF_SIZE ) {ehci_trace_guest_bug (p->queue->ehci,"guest requested more bytes than allowed" );
Quoted 12 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.
Quoted 6 lines
Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.
If you send me an alternate patch, I'll be happy to insert it into my build to give it some test coverage.
Thanks,
Guenter
Quoted 22 lines
Quoted 22 lines
Signed-off-by Guenter Roeck <[email protected]>--- hw/usb/hcd-ehci.c | 5 +++++ 1 file changed, 5 insertions(+)hw/usb/hcd-ehci.c +5
-0@@ -1348,6 +1348,11 @@ static int ehci_execute(EHCIPacket *p, const char *action)return -1 ; } +if (p->queue->dev ==NULL ) { +ehci_trace_guest_bug (p->queue->ehci,"No device attached to queue\n" ); +return -1 ; + } +if (get_field (p->qtd.token,QTD_TOKEN_TBYTES ) >BUFF_SIZE ) {ehci_trace_guest_bug (p->queue->ehci,"guest requested more bytes than allowed" );
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.
Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.
The two ehci_queues_rip_all() calls in ehci_reset() should clean up everything properly.
Can you try the patch below to see whenever a ehci_find_device failure is the root cause?
thanks,
Gerd
hw/usb/hcd-ehci.c +4 -0
@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }if (async && (q->qh.epchar &QH_EPCHAR_H )) {
Quoted 35 lines · Gerd Hoffmann
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.The two
ehci_queues_rip_all()calls inehci_reset()should clean up everything properly.Can you try the patch below to see whenever a
ehci_find_devicefailure is the root cause?thanks,
Gerdhw/usb/hcd-ehci.c +0
-0
hw/usb/hcd-ehci.c static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) · line 1650
Quoted 7 lines
hw/usb/hcd-ehci.c +4
-0@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }
I had tried that, but this does happen as standard behavior for some architectures (I didn't write down where exactly since I thought it must be normal). But, sure, I'll add a log message.
Guenter
Quoted 3 lines
hw/usb/hcd-ehci.c +0
-0if (async && (q->qh.epchar &QH_EPCHAR_H )) {
Quoted 31 lines · Guenter Roeck
Quoted 30 lines · Gerd Hoffmann
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.The two
ehci_queues_rip_all()calls inehci_reset()should clean up everything properly.Can you try the patch below to see whenever a
ehci_find_devicefailure is the root cause?thanks,
Gerd
Quoted 17 lines
hw/usb/hcd-ehci.c static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) · line 1650
Quoted 12 lines
hw/usb/hcd-ehci.c +4
-0@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }I had tried that, but this does happen as standard behavior for some architectures (I didn't write down where exactly since I thought it must be normal). But, sure, I'll add a log message.
With the log message added, I see it a lot when booting riscv64 images from usb-ehci.
ehci_state_fetchqh: device 0 not found
It looks like this happens for each usb access (a whopping 800+ times for a simple boot test). So it is definitely a very common condition. The relevant qemu command line is something like
-usb -device usb-ehci,id=ehci -device usb-storage,bus=ehci.0,drive=d0 \ -drive file=rootfs.ext2,if=none,id=d0,format=raw
The image works fine otherwise, so I thought that the condition is normal.
Guenter
Quoted 35 lines · Gerd Hoffmann
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.The two
ehci_queues_rip_all()calls inehci_reset()should clean up everything properly.Can you try the patch below to see whenever a
ehci_find_devicefailure is the root cause?thanks,
Gerdhw/usb/hcd-ehci.c +0
-0
hw/usb/hcd-ehci.c static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) · line 1651
Quoted 8 lines
hw/usb/hcd-ehci.c +4
-0@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }
Turns out I end up seeing that message hundreds of times early on each boot, no matter which architecture. It is quite obviously a normal operating condition.
Guenter
Quoted 31 lines · Guenter Roeck
Quoted 30 lines · Gerd Hoffmann
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.The two
ehci_queues_rip_all()calls inehci_reset()should clean up everything properly.Can you try the patch below to see whenever a
ehci_find_devicefailure is the root cause?thanks,
Gerd
Quoted 14 lines
hw/usb/hcd-ehci.c static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) · line 1650
Quoted 12 lines
hw/usb/hcd-ehci.c +4
-0@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }Turns out I end up seeing that message hundreds of times early on each boot, no matter which architecture. It is quite obviously a normal operating condition.
Yep, as long as the queue is not active this is completely harmless. So we need to check a bit later. In execute() looks a bit too late though, we don't have a good backup plan then.
Does the patch below solve the problem without bad side effects?
thanks,
Gerd
From 5980eaad23f675a2d509d0c55e288793619761bc Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <[email protected]>
Date: Tue, 13 Aug 2019 13:37:09 +0200
Subject: [PATCH] ehci: try fix queue->dev null ptr dereference
--- hw/usb/hcd-ehci.c | 3 +++ 1 file changed, 3 insertions(+)
hw/usb/hcd-ehci.c +3 -0
@@ -1834,6 +1834,9 @@ static int ehci_state_fetchqtd(EHCIQueue *q)ehci_set_state (q->ehci, q->async,EST_EXECUTING );break ; } + }else if (q->dev ==NULL ) { +ehci_trace_guest_bug (q->ehci,"no device attached to queue" ); +ehci_set_state (q->ehci, q->async,EST_HORIZONTALQH ); }else { p =ehci_alloc_packet (q); p->qtdaddr = q->qtdaddr;
Signature · 1 line
2.18.1
Quoted 47 lines · Gerd Hoffmann
Quoted 31 lines · Guenter Roeck
Quoted 30 lines · Gerd Hoffmann
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.The two
ehci_queues_rip_all()calls inehci_reset()should clean up everything properly.Can you try the patch below to see whenever a
ehci_find_devicefailure is the root cause?thanks,
GerdQuoted 14 lines
hw/usb/hcd-ehci.c static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) · line 1650
Quoted 12 lines
hw/usb/hcd-ehci.c +4
-0@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }Turns out I end up seeing that message hundreds of times early on each boot, no matter which architecture. It is quite obviously a normal operating condition.
Quoted 6 lines
Yep, as long as the queue is not active this is completely harmless. So we need to check a bit later. In
execute()looks a bit too late though, we don't have a good backup plan then.Does the patch below solve the problem without bad side effects?
I reverted my patch and applied the patch below to my builds of qemu, for both v4.0 and v4.1, and installed it in my test bed. I'll let you know how it goes.
Thanks,
Guenter
Quoted 31 lines
thanks,
GerdFrom
5980eaad23f675a2d509d0c55e288793619761bcMon Sep 17 00:00:00 2001
From: Gerd Hoffmann <[email protected]>
Date: Tue, 13 Aug 2019 13:37:09 +0200
Subject: [PATCH] ehci: try fixqueue->devnull ptr dereferenceReported-by Guenter Roeck <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- hw/usb/hcd-ehci.c | 3 +++ 1 file changed, 3 insertions(+)hw/usb/hcd-ehci.c +3
-0@@ -1834,6 +1834,9 @@ static int ehci_state_fetchqtd(EHCIQueue *q)ehci_set_state (q->ehci, q->async,EST_EXECUTING );break ; } + }else if (q->dev ==NULL ) { +ehci_trace_guest_bug (q->ehci,"no device attached to queue" ); +ehci_set_state (q->ehci, q->async,EST_HORIZONTALQH ); }else { p =ehci_alloc_packet (q); p->qtdaddr = q->qtdaddr;Signature · 1 line
2.18.1
Guenter Roeck
Tested-byQuoted 73 lines · Gerd Hoffmann
Quoted 31 lines · Guenter Roeck
Quoted 30 lines · Gerd Hoffmann
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Guenter Roeck
The following assert is seen once in a while while resetting the Linux kernel.
qemu-system-x86_64:
hw/usb/core.c:734:usb_ep_get:Assertion `dev != NULL' failed.Quoted 7 lines
Quoted 4 lines
The call to
usb_ep_get()originates fromehci_execute(). Analysis and debugging shows thatp->queue->devcan indeed be NULL in this function. Add check for this condition and return an error if it is seen.Your patch is not wrong as it corrects your case, but I wonder why we get there. This assert seems to have catched a bug.
https://bugzilla.redhat.com//show_bug.cgi?id=1715801 maybe.
Quoted 2 lines
Gerd, shouldn't we call
usb_packet_cleanup()inehci_reset()rather thanehci_finalize()? Then we shouldn't need this patch.The two
ehci_queues_rip_all()calls inehci_reset()should clean up everything properly.Can you try the patch below to see whenever a
ehci_find_devicefailure is the root cause?thanks,
GerdQuoted 14 lines
hw/usb/hcd-ehci.c static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) · line 1650
Quoted 12 lines
hw/usb/hcd-ehci.c +4
-0@@ -1644,6 +1644,10 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) q->dev =ehci_find_device (q->ehci,get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); } +if (q->dev ==NULL ) { +fprintf (stderr,"%s: device %d not found\n" , __func__, +get_field (q->qh.epchar,QH_EPCHAR_DEVADDR )); + }Turns out I end up seeing that message hundreds of times early on each boot, no matter which architecture. It is quite obviously a normal operating condition.
Yep, as long as the queue is not active this is completely harmless. So we need to check a bit later. In
execute()looks a bit too late though, we don't have a good backup plan then.Does the patch below solve the problem without bad side effects?
thanks,
GerdQuoted 1 line
From
5980eaad23f675a2d509d0c55e288793619761bcMon Sep 17 00:00:00 2001From: Gerd Hoffmann <[email protected]>
Date: Tue, 13 Aug 2019 13:37:09 +0200
Subject: [PATCH] ehci: try fixqueue->devnull ptr dereferenceReported-by Guenter Roeck <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- hw/usb/hcd-ehci.c | 3 +++ 1 file changed, 3 insertions(+)hw/usb/hcd-ehci.c +0
-0
hw/usb/hcd-ehci.c static int ehci_state_fetchqtd(EHCIQueue *q) · line 1842
Quoted 9 lines
hw/usb/hcd-ehci.c +3
-0@@ -1834,6 +1834,9 @@ static int ehci_state_fetchqtd(EHCIQueue *q)ehci_set_state (q->ehci, q->async,EST_EXECUTING );break ; } + }else if (q->dev ==NULL ) { +ehci_trace_guest_bug (q->ehci,"no device attached to queue" ); +ehci_set_state (q->ehci, q->async,EST_HORIZONTALQH ); }else { p =ehci_alloc_packet (q); p->qtdaddr = q->qtdaddr;
That seems to be working as intended. I have not seen a crash since I applied it. I tested it on top of v4.0 and v4.1.
Guenter
Hi,
Quoted 8 lines
Quoted 5 lines
Yep, as long as the queue is not active this is completely harmless. So we need to check a bit later. In
execute()looks a bit too late though, we don't have a good backup plan then.Does the patch below solve the problem without bad side effects?
That seems to be working as intended. I have not seen a crash since I applied it. I tested it on top of v4.0 and v4.1.
Thanks. Send as formal patch now.
cheers,
Gerd