Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe
Subsystems (3)
PATCH 2/2 Fix a NULL-ptr-deref bug in ath10k_usb_alloc_urb_from_pipe
The ar_usb field of ath10k_usb_pipe_usb_pipe objects are initialized to point to the containing ath10k_usb object according to endpoint descriptors read from the device side, as shown below in ath10k_usb_setup_pipe_resources:
for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
endpoint = &iface_desc->endpoint[i].desc;
// get the address from endpoint descriptor
pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb,
endpoint->bEndpointAddress,
&urbcount);
......
// select the pipe object
pipe = &ar_usb->pipes[pipe_num];
// initialize the ar_usb field
pipe->ar_usb = ar_usb;
}The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref ath10k_usb_alloc_urb_from_pipe and ath10k_usb_free_urb_to_pipe.
This patch fixes the bug by preventing potential NULL-ptr-deref.
--- drivers/net/wireless/ath/ath10k/usb.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/ath/ath10k/usb.c +8 -0
@@ -38,6 +38,10 @@ ath10k_usb_alloc_urb_from_pipe(struct ath10k_usb_pipe *pipe)struct ath10k_urb_context *urb_context =NULL ;unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return NULL ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags);if (!list_empty (&pipe->urb_list_head)) { urb_context = list_first_entry(&pipe->urb_list_head,
@@ -55,6 +59,10 @@ static void ath10k_usb_free_urb_to_pipe(struct ath10k_usb_pipe *pipe, {unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return NULL ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags); pipe->urb_cnt++;
Signature · 1 line
2.22.0
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.
Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Hi,
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.
Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>
This patch fixes CVE-2019-15099, which has CVSS scores of 7.5 (CVSS 3.0) and 7.8 (CVSS 2.0). Yet, I don't find it in the upstream kernel or in Linux next.
Is the patch going to be applied to the upstream kernel anytime soon ? If not, is there reason to believe that its severity may not be as high as the CVSS score indicates ?
Thanks,
Guenter
Quoted 33 lines
--- drivers/net/wireless/ath/ath10k/usb.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/net/wireless/ath/ath10k/usb.c +8
-0@@ -38,6 +38,10 @@ ath10k_usb_alloc_urb_from_pipe(struct ath10k_usb_pipe *pipe)struct ath10k_urb_context *urb_context =NULL ;unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return NULL ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags);if (!list_empty (&pipe->urb_list_head)) { urb_context = list_first_entry(&pipe->urb_list_head,@@ -55,6 +59,10 @@ static void ath10k_usb_free_urb_to_pipe(struct ath10k_usb_pipe *pipe, {unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return NULL ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags); pipe->urb_cnt++;Signature · 1 line
2.22.0
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 35 lines · Guenter Roeck
Hi,
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>
Quoted 5 lines
This patch fixes CVE-2019-15099, which has CVSS scores of 7.5 (CVSS 3.0) and 7.8 (CVSS 2.0). Yet, I don't find it in the upstream kernel or in Linux next.
Is the patch going to be applied to the upstream kernel anytime soon ?
Same answer as in patch 1:
https://patchwork.kernel.org/patch/11074655/
Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 41 lines · Kalle Valo
Quoted 39 lines · Guenter Roeck
Hi,
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>This patch fixes CVE-2019-15099, which has CVSS scores of 7.5 (CVSS 3.0) and 7.8 (CVSS 2.0). Yet, I don't find it in the upstream kernel or in Linux next.
Quoted 6 lines
Quoted 1 line
Is the patch going to be applied to the upstream kernel anytime soon ?
Same answer as in patch 1:
Sorry to bring this up again. The ath6k patch made it into the upstream kernel, but the ath10k patch didn't. Did it get lost, or was there a reason not to apply this patch ?
Thanks,
Guenter
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 44 lines · Guenter Roeck
Quoted 43 lines · Kalle Valo
Quoted 40 lines · Guenter Roeck
Hi,
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>This patch fixes CVE-2019-15099, which has CVSS scores of 7.5 (CVSS 3.0) and 7.8 (CVSS 2.0). Yet, I don't find it in the upstream kernel or in Linux next.
Is the patch going to be applied to the upstream kernel anytime soon ?
Quoted 8 lines
Quoted 4 lines
Same answer as in patch 1:
Sorry to bring this up again. The ath6k patch made it into the upstream kernel, but the ath10k patch didn't. Did it get lost, or was there a reason not to apply this patch ?
This patch had a build warning, you can see it from patchwork:
https://patchwork.kernel.org/patch/11074657/
Can someone fix it and resend the patch, please?
Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 55 lines · Kalle Valo
Quoted 44 lines · Guenter Roeck
Quoted 43 lines · Kalle Valo
Quoted 40 lines · Guenter Roeck
Hi,
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>This patch fixes CVE-2019-15099, which has CVSS scores of 7.5 (CVSS 3.0) and 7.8 (CVSS 2.0). Yet, I don't find it in the upstream kernel or in Linux next.
Is the patch going to be applied to the upstream kernel anytime soon ?
Quoted 8 lines
Quoted 4 lines
Same answer as in patch 1:
Sorry to bring this up again. The ath6k patch made it into the upstream kernel, but the ath10k patch didn't. Did it get lost, or was there a reason not to apply this patch ?
Quoted 6 lines
This patch had a build warning, you can see it from patchwork:
https://patchwork.kernel.org/patch/11074657/
Can someone fix it and resend the patch, please?
Done.
Guenter
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 34 lines · Guenter Roeck
Hi,
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.Quoted 5 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>
Quoted 7 lines
This patch fixes CVE-2019-15099, which has CVSS scores of 7.5 (CVSS 3.0) and 7.8 (CVSS 2.0). Yet, I don't find it in the upstream kernel or in Linux next.
Is the patch going to be applied to the upstream kernel anytime soon ? If not, is there reason to believe that its severity may not be as high as the CVSS score indicates ?
The score was assigned by MITRE.
Same as previous ones, it is under review, once passed, it will be applied.
Quoted 32 lines
Thanks,
GuenterQuoted 29 lines
--- drivers/net/wireless/ath/ath10k/usb.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/net/wireless/ath/ath10k/usb.c +8
-0@@ -38,6 +38,10 @@ ath10k_usb_alloc_urb_from_pipe(struct ath10k_usb_pipe *pipe)struct ath10k_urb_context *urb_context =NULL ;unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return NULL ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags);if (!list_empty (&pipe->urb_list_head)) { urb_context = list_first_entry(&pipe->urb_list_head,@@ -55,6 +59,10 @@ static void ath10k_usb_free_urb_to_pipe(struct ath10k_usb_pipe *pipe, {unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return NULL ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags);
Quoted 4 lines
Quoted 4 lines
drivers/net/wireless/ath/ath10k/usb.c +0
-0pipe->urb_cnt++;Signature · 1 line
2.22.0
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.
Quoted 6 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>Reviewed-by Greg Kroah-Hartman <[email protected]>
This causes a new warning, please build test your patches.
In file included from ./include/uapi/linux/posix_types.h:5,
from ./include/uapi/linux/types.h:14,
from ./include/linux/types.h:6,
from ./include/linux/list.h:5,
from ./include/linux/module.h:9,
from drivers/net/wireless/ath/ath10k/usb.c:8:
drivers/net/wireless/ath/ath10k/usb.c: In function 'ath10k_usb_free_urb_to_pipe':
./include/linux/stddef.h:8:14: warning: 'return' with a value, in function returning void
#define NULL ((void *)0)
^
drivers/net/wireless/ath/ath10k/usb.c:64:10: note: in expansion of macro 'NULL'
return NULL;
^~~~
drivers/net/wireless/ath/ath10k/usb.c:57:13: note: declared here
static void ath10k_usb_free_urb_to_pipe(struct ath10k_usb_pipe *pipe,
^~~~~~~~~~~~~~~~~~~~~~~~~~~Patch set to Changes Requested.
Signature · 3 lines
https://patchwork.kernel.org/patch/11074657/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath10k_usb_pipe_usb_pipeobjects are initialized to point to the containingath10k_usbobject according to endpoint descriptors read from the device side, as shown below inath10k_usb_setup_pipe_resources:for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; // get the address from endpoint descriptor pipe_num = ath10k_usb_get_logical_pipe_num(ar_usb, endpoint->bEndpointAddress, &urbcount); ...... // select the pipe object pipe = &ar_usb->pipes[pipe_num]; // initialize the ar_usb field pipe->ar_usb = ar_usb; }The driver assumes that the addresses reported in endpoint descriptors from device side to be complete. If a device is malicious and does not report complete addresses, it may trigger NULL-ptr-deref
ath10k_usb_alloc_urb_from_pipeandath10k_usb_free_urb_to_pipe.
Quoted 6 lines
This patch fixes the bug by preventing potential NULL-ptr-deref.
Signed-off-by Hui Peng <[email protected]>Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>Reviewed-by Greg Kroah-Hartman <[email protected]>
This causes a new warning, please build test your patches.
In file included from ./include/uapi/linux/posix_types.h:5,
from ./include/uapi/linux/types.h:14,
from ./include/linux/types.h:6,
from ./include/linux/list.h:5,
from ./include/linux/module.h:9,
from drivers/net/wireless/ath/ath10k/usb.c:8:
drivers/net/wireless/ath/ath10k/usb.c: In function 'ath10k_usb_free_urb_to_pipe':
./include/linux/stddef.h:8:14: warning: 'return' with a value, in function returning void
#define NULL ((void *)0)
^
drivers/net/wireless/ath/ath10k/usb.c:64:10: note: in expansion of macro 'NULL'
return NULL;
^~~~
drivers/net/wireless/ath/ath10k/usb.c:57:13: note: declared here
static void ath10k_usb_free_urb_to_pipe(struct ath10k_usb_pipe *pipe,
^~~~~~~~~~~~~~~~~~~~~~~~~~~Patch set to Changes Requested.
Signature · 9 lines
https://patchwork.kernel.org/patch/11074657/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k