Path: csiph.com!news.freedyn.net!open-news-network.org!aioe.org!bofh.it!news.nic.it!robomod From: Willy Tarreau Newsgroups: linux.kernel Subject: [PATCH 3.10 186/250] USB: wusbcore: fix NULL-deref at probe Date: Thu, 08 Jun 2017 01:10:03 +0200 Message-ID: References: X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 36 Organization: linux.* mail to news gateway X-Original-Cc: Johan Hovold , Inaky Perez-Gonzalez , David Vrabel , Willy Tarreau X-Original-Date: Thu, 8 Jun 2017 00:59:32 +0200 X-Original-Message-ID: <1496876436-32402-187-git-send-email-w@1wt.eu> X-Original-References: <1496876436-32402-1-git-send-email-w@1wt.eu> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1660318 From: Johan Hovold commit 03ace948a4eb89d1cf51c06afdfc41ebca5fdb27 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. This specifically fixes the NULL-pointer dereference when probing HWA HC devices. Fixes: df3654236e31 ("wusb: add the Wire Adapter (WA) core") Cc: Inaky Perez-Gonzalez Cc: David Vrabel Signed-off-by: Johan Hovold Signed-off-by: Willy Tarreau --- drivers/usb/wusbcore/wa-hc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c index a09b65e..2bb0fd3 100644 --- a/drivers/usb/wusbcore/wa-hc.c +++ b/drivers/usb/wusbcore/wa-hc.c @@ -38,6 +38,9 @@ int wa_create(struct wahc *wa, struct usb_interface *iface) int result; struct device *dev = &iface->dev; + if (iface->cur_altsetting->desc.bNumEndpoints < 3) + return -ENODEV; + result = wa_rpipes_create(wa); if (result < 0) goto error_rpipes_create; -- 2.8.0.rc2.1.gbe9624a