Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp849034pja; Wed, 1 Apr 2020 09:48:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtplq81eDv8bsg5GBssF/fmzUlYiVx6VPA94e1R2Oj5PCwsCbi0PLNhzAh8ehcLzEN1VOcN X-Received: by 2002:a9d:7a8:: with SMTP id 37mr18446128oto.209.1585759690023; Wed, 01 Apr 2020 09:48:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759690; cv=none; d=google.com; s=arc-20160816; b=UAcvzkaL7eF+QV0ZVljrOs+MVhGkekE+D06o/u6sBq80mwy7FE7pFJcMrifWDOfcha Yhy0TAo6DKtrYialLe3DLJhXuksiLKQbBMBG6YZQ6YNP+anbH7HTzsUGz9CEgSHyCki1 JvtcKTinbAeHPOfQOrpMmfl0kGJamMoxCI77RMN7it7qR8bOKq6R6ifUgwS1N634EL1R T9zXXLxUYbYxaAmpCdx4JTC94uTF24k3PkvQ9qQ1tZXtuBz+NP4L8Xqfb6rXbgUIM6y3 V6h+EOgbvnrmhw8ETwZvK9T4nkvngDIOtIsOW6hdtI6CC05a6sS90+CglEAjOTCOg5Ot HRUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=k2MMtHLATYqhSBsQH8MCtnorikb0Kq/9gNh2g/UY0V4=; b=FtHLSqz4gyraEXK+4Tu6QHBIlUPOb1J3tXDztv/qVcoeiruZmYG/735iqJIoSGWqbj yM/kZNJ+ofbgmRsNvnmLlq+rck2x369BO93dYxHGkxJ3O76GOAx6u3cy7vS+n6QD3hG1 DbSNGMnyJvxyKA3EuGRv+XRngb2F0YF+rKNOT0ErGhjppbaBSuh9UPkS9xrCUHW2Cj6E guY9b1SS3Ul+0Ng78NIDvtXXPw+ug2NV37WQp2evLYz6AqqzE4damVa8OeFHhzkxxgfy xCHTYDVtXk/U/aznvnGjaGuV37ZQAw5HMqY3Ha/CQil1Xhr9QGmu4bXehrDmkpg4L3AU leiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TLKx1Pyb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p126si1097386oib.73.2020.04.01.09.47.56; Wed, 01 Apr 2020 09:48:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TLKx1Pyb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390018AbgDAQrA (ORCPT + 99 others); Wed, 1 Apr 2020 12:47:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:48576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390012AbgDAQq6 (ORCPT ); Wed, 1 Apr 2020 12:46:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D28DC20705; Wed, 1 Apr 2020 16:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759618; bh=m/m/Jw3A3ciNENbhVb8c9FbUWlsYv2sjeNllAtN62Ak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLKx1Pyb1amAw4UGt8/fvCEByFin3ohEA+tldmsT3Q6QshRYrnfbCv20TbAm76bWv HZGIwsAYOIRSo4dBPvjt7Y/gqGVwH4px2BrW2nmCwMYD9ic3MlIbvvaE+gd0Wscgzu GgPBGV51RgSgrOVJCJn6V7H9xhs4JjzmB3RDyTFk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oliver Neukum , Johan Hovold , Sean Young , Mauro Carvalho Chehab Subject: [PATCH 4.14 120/148] media: flexcop-usb: fix endpoint sanity check Date: Wed, 1 Apr 2020 18:18:32 +0200 Message-Id: <20200401161603.979297284@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold commit bca243b1ce0e46be26f7c63b5591dfbb41f558e5 upstream. commit 1b976fc6d684 ("media: b2c2-flexcop-usb: add sanity checking") added an endpoint sanity check to address a NULL-pointer dereference on probe. Unfortunately the check was done on the current altsetting which was later changed. Fix this by moving the sanity check to after the altsetting is changed. Fixes: 1b976fc6d684 ("media: b2c2-flexcop-usb: add sanity checking") Cc: Oliver Neukum Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/b2c2/flexcop-usb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/media/usb/b2c2/flexcop-usb.c +++ b/drivers/media/usb/b2c2/flexcop-usb.c @@ -510,6 +510,9 @@ static int flexcop_usb_init(struct flexc return ret; } + if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1) + return -ENODEV; + switch (fc_usb->udev->speed) { case USB_SPEED_LOW: err("cannot handle USB speed because it is too slow."); @@ -543,9 +546,6 @@ static int flexcop_usb_probe(struct usb_ struct flexcop_device *fc = NULL; int ret; - if (intf->cur_altsetting->desc.bNumEndpoints < 1) - return -ENODEV; - if ((fc = flexcop_device_kmalloc(sizeof(struct flexcop_usb))) == NULL) { err("out of memory\n"); return -ENOMEM;