aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-13 08:44:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-25 09:44:35 -0400
commitadc6647c4f0f6f7f3d838d1ccd7398695b6b0702 (patch)
tree0ff01836179c7bd0e29fa098a3f8edba3c969c77 /drivers/net/wireless
parentc39bafb9ee7a2aaaf71cdcac7bd583ee741b3da2 (diff)
ath9k_htc: fix NULL-deref at probe
commit ebeb36670ecac36c179b5fb5d5c88ff03ba191ec upstream. Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer or accessing memory beyond the endpoint array should a malicious device lack the expected endpoints. Fixes: 36bcce430657 ("ath9k_htc: Handle storage devices") Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/hif_usb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index a9b15186df34..f15589c70284 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -1219,6 +1219,9 @@ static int send_eject_command(struct usb_interface *interface)
1219 u8 bulk_out_ep; 1219 u8 bulk_out_ep;
1220 int r; 1220 int r;
1221 1221
1222 if (iface_desc->desc.bNumEndpoints < 2)
1223 return -ENODEV;
1224
1222 /* Find bulk out endpoint */ 1225 /* Find bulk out endpoint */
1223 for (r = 1; r >= 0; r--) { 1226 for (r = 1; r >= 0; r--) {
1224 endpoint = &iface_desc->endpoint[r].desc; 1227 endpoint = &iface_desc->endpoint[r].desc;