summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2019-10-03 09:09:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-04 11:02:58 +0200
commit177238c3d47d54b2ed8f0da7a4290db492f4a057 (patch)
treea4dbf7a531d7f37b735d0f6f3afd809bcbed50bd
parent0aa760382040cc3d70b538ade56ba9c37ed8b702 (diff)
downloadlinux-stable-177238c3d47d54b2ed8f0da7a4290db492f4a057.tar.gz
linux-stable-177238c3d47d54b2ed8f0da7a4290db492f4a057.tar.bz2
linux-stable-177238c3d47d54b2ed8f0da7a4290db492f4a057.zip
USB: microtek: fix info-leak at probe
Add missing bulk-in endpoint sanity check to prevent uninitialised stack data from being reported to the system log and used as endpoint addresses. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable <stable@vger.kernel.org> Reported-by: syzbot+5630ca7c3b2be5c9da5e@syzkaller.appspotmail.com Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Oliver Neukum <oneukum@suse.com> Link: https://lore.kernel.org/r/20191003070931.17009-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/image/microtek.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 0a57c2cc8e5a..7a6b122c833f 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -716,6 +716,10 @@ static int mts_usb_probe(struct usb_interface *intf,
}
+ if (ep_in_current != &ep_in_set[2]) {
+ MTS_WARNING("couldn't find two input bulk endpoints. Bailing out.\n");
+ return -ENODEV;
+ }
if ( ep_out == -1 ) {
MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" );