From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9994C32750 for ; Wed, 14 Aug 2019 02:33:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 885D820842 for ; Wed, 14 Aug 2019 02:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565750027; bh=rrk9/8EgLkAoFGEbZoXPVCLUP0cQcpOx1d21FoZD+MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0go6nrIZYqPAju5Vbcx6ihDFnKg0mmelGsWe2nEwmWjZGaviuw1IAnYoWSdNCr1xB nmzkJM44mBY/iw2pk1IKKSvuv5VypMesTA+RpwElgINwLTDDx5BvphtTmTxkzrOPYY iwSUoakEvpi/b2hnu9ZjIWInAbgT4aX8K+qb+AVU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729257AbfHNCdq (ORCPT ); Tue, 13 Aug 2019 22:33:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:46152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728618AbfHNCOL (ORCPT ); Tue, 13 Aug 2019 22:14:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94E1120842; Wed, 14 Aug 2019 02:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748850; bh=rrk9/8EgLkAoFGEbZoXPVCLUP0cQcpOx1d21FoZD+MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vsgOFiAiqj713DW35E6qfPykQdETybI6rRjfLoAnb+1zZ14pcopdjeToNlExFQaNA Dbc5MH4M5nCzlQWST1RFUrjShv/0lOIEYlrBD2aIG4sj2li5c9bBXc8sVYvdYNMKyG jht4nlK9jSZaihkserKkINpsfsR7FzVs6mIAnpmQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Neukum , syzbot+5efc10c005014d061a74@syzkaller.appspotmail.com, Dmitry Torokhov , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 101/123] Input: iforce - add sanity checks Date: Tue, 13 Aug 2019 22:10:25 -0400 Message-Id: <20190814021047.14828-101-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oliver Neukum [ Upstream commit 849f5ae3a513c550cad741c68dd3d7eb2bcc2a2c ] The endpoint type should also be checked before a device is accepted. Reported-by: syzbot+5efc10c005014d061a74@syzkaller.appspotmail.com Signed-off-by: Oliver Neukum Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/joystick/iforce/iforce-usb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index f1569ae8381bc..a0a686f56ac4f 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -129,7 +129,12 @@ static int iforce_usb_probe(struct usb_interface *intf, return -ENODEV; epirq = &interface->endpoint[0].desc; + if (!usb_endpoint_is_int_in(epirq)) + return -ENODEV; + epout = &interface->endpoint[1].desc; + if (!usb_endpoint_is_int_out(epout)) + return -ENODEV; if (!(iforce = kzalloc(sizeof(struct iforce) + 32, GFP_KERNEL))) goto fail; -- 2.20.1