Fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe
Subsystems (3)
PATCH 1/2 Fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe
The ar_usb field of ath6kl_usb_pipe_usb_pipe objects are initialized to point to the containing ath6kl_usb object according to endpoint descriptors read from the device side, as shown below in ath6kl_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 = ath6kl_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 ath6kl_usb_alloc_urb_from_pipe and ath6kl_usb_free_urb_to_pipe.
This patch fixes the bug by preventing potential NULL-ptr-deref.
--- drivers/net/wireless/ath/ath6kl/usb.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/ath/ath6kl/usb.c +8 -0
@@ -132,6 +132,10 @@ ath6kl_usb_alloc_urb_from_pipe(struct ath6kl_usb_pipe *pipe)struct ath6kl_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 =
@@ -150,6 +154,10 @@ static void ath6kl_usb_free_urb_to_pipe(struct ath6kl_usb_pipe *pipe, {unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return ; +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 ofath6kl_usb_pipe_usb_pipeobjects are initialized to point to the containingath6kl_usbobject according to endpoint descriptors read from the device side, as shown below inath6kl_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 = ath6kl_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
ath6kl_usb_alloc_urb_from_pipeandath6kl_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 26 lines · Hui Peng
The
ar_usbfield ofath6kl_usb_pipe_usb_pipeobjects are initialized to point to the containingath6kl_usbobject according to endpoint descriptors read from the device side, as shown below inath6kl_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 = ath6kl_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
ath6kl_usb_alloc_urb_from_pipeandath6kl_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]>
I don't see this patch in the upstream kernel or in -next.
At the same time, it is supposed to fix CVE-2019-15098, which has a CVSS v2.0 score of 7.8 (high).
Is this patch going to be applied to the upstream kernel ? If not, are there reasons to believe that the vulnerability is not as severe as its CVSS score indicates ?
Thanks,
Guenter
Quoted 33 lines
--- drivers/net/wireless/ath/ath6kl/usb.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/net/wireless/ath/ath6kl/usb.c +8
-0@@ -132,6 +132,10 @@ ath6kl_usb_alloc_urb_from_pipe(struct ath6kl_usb_pipe *pipe)struct ath6kl_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 =@@ -150,6 +154,10 @@ static void ath6kl_usb_free_urb_to_pipe(struct ath6kl_usb_pipe *pipe, {unsigned long flags; +/* bail if this pipe is not initialized */ +if (!pipe->ar_usb) +return ; +spin_lock_irqsave (&pipe->ar_usb->cs_lock, flags); pipe->urb_cnt++;Signature · 1 line
2.22.0
Quoted 33 lines · Guenter Roeck
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath6kl_usb_pipe_usb_pipeobjects are initialized to point to the containingath6kl_usbobject according to endpoint descriptors read from the device side, as shown below inath6kl_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 = ath6kl_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
ath6kl_usb_alloc_urb_from_pipeandath6kl_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 6 lines
I don't see this patch in the upstream kernel or in -next.
At the same time, it is supposed to fix CVE-2019-15098, which has a CVSS v2.0 score of 7.8 (high).
Is this patch going to be applied to the upstream kernel ?
Lately I have been very busy and I have not had a chance to apply ath6kl nor ath10k patches. This patch is on my queue and my plan is to go through my patch queue next week.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
A message that is not in the archive (sent off-list or not yet received): CAKpmkkXyhuTviRfJG9dG-=Pt0KKdoHaxhXdvW9tSadOoKfnP1w@mail.gmail.com
Quoted 3 lines · Hui Peng
The reason that this patch is still in the pending state is that it has not reviewed by maintainers (they are not responding). @Greg: can we apply it?
Who is "we" in this case? But anyway, I'll review the patch and if it's ok I'll take it through my ath.git tree, as normal.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 26 lines · Hui Peng
The
ar_usbfield ofath6kl_usb_pipe_usb_pipeobjects are initialized to point to the containingath6kl_usbobject according to endpoint descriptors read from the device side, as shown below inath6kl_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 = ath6kl_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
ath6kl_usb_alloc_urb_from_pipeandath6kl_usb_free_urb_to_pipe.
Quoted 8 lines
This patch fixes the bug by preventing potential NULL-ptr-deref (CVE-2019-15098).
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]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
39d170b3cb62 ath6kl: fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe()
Signature · 3 lines
https://patchwork.kernel.org/patch/11074655/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches