From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845AbdCMMgy (ORCPT ); Mon, 13 Mar 2017 08:36:54 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36247 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752204AbdCMMgU (ORCPT ); Mon, 13 Mar 2017 08:36:20 -0400 From: Johan Hovold To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable , Henk Subject: [PATCH 4/7] Input: yealink - fix NULL-deref at probe Date: Mon, 13 Mar 2017 13:35:36 +0100 Message-Id: <20170313123539.28103-5-johan@kernel.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170313123539.28103-1-johan@kernel.org> References: <20170313123539.28103-1-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer should a malicious device lack endpoints. Fixes: aca951a22a1d ("[PATCH] input-driver-yealink-P1K-usb-phone") Cc: stable # 2.6.14 Cc: Henk Signed-off-by: Johan Hovold --- drivers/input/misc/yealink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c index 79c964c075f1..6e7ff9561d92 100644 --- a/drivers/input/misc/yealink.c +++ b/drivers/input/misc/yealink.c @@ -875,6 +875,10 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) int ret, pipe, i; interface = intf->cur_altsetting; + + if (interface->desc.bNumEndpoints < 1) + return -ENODEV; + endpoint = &interface->endpoint[0].desc; if (!usb_endpoint_is_int_in(endpoint)) return -ENODEV; -- 2.12.0