Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1599286 > unrolled thread

[PATCH] isdn/gigaset: fix NULL-deref at probe

Back to article view | Back to linux.kernel

Contents

  [PATCH] isdn/gigaset: fix NULL-deref at probe Johan Hovold <johan@kernel.org> - 2017-03-13 13:40 +0100
    Re: [PATCH] isdn/gigaset: fix NULL-deref at probe David Miller <davem@davemloft.net> - 2017-03-13 20:30 +0100

#1599286 — [PATCH] isdn/gigaset: fix NULL-deref at probe

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.

Fixes: cf7776dc05b8 ("[PATCH] isdn4linux: Siemens Gigaset drivers -
direct USB connection")
Cc: stable <stable@vger.kernel.org>	# 2.6.17
Cc: Hansjoerg Lipp <hjlipp@web.de>

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/isdn/gigaset/bas-gigaset.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 11e13c56126f..2da3ff650e1d 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2317,6 +2317,9 @@ static int gigaset_probe(struct usb_interface *interface,
 		return -ENODEV;
 	}
 
+	if (hostif->desc.bNumEndpoints < 1)
+		return -ENODEV;
+
 	dev_info(&udev->dev,
 		 "%s: Device matched (Vendor: 0x%x, Product: 0x%x)\n",
 		 __func__, le16_to_cpu(udev->descriptor.idVendor),
-- 
2.12.0

[toc] | [next] | [standalone]

#1599720

From: Johan Hovold <johan@kernel.org>
Date: Mon, 13 Mar 2017 13:39:01 +0100

> Make sure to check the number of endpoints to avoid dereferencing a
> NULL-pointer should a malicious device lack endpoints.
> 
> Fixes: cf7776dc05b8 ("[PATCH] isdn4linux: Siemens Gigaset drivers -
> direct USB connection")
> Cc: stable <stable@vger.kernel.org>	# 2.6.17
> Cc: Hansjoerg Lipp <hjlipp@web.de>
> 
> Signed-off-by: Johan Hovold <johan@kernel.org>

Applied.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web