Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp851168pja; Wed, 1 Apr 2020 09:50:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs57i33PgMu38BdvaCxqsQRwN+D7LcD1GctuerWGlDbCo44mxWgiI9a+eAjZp2QkhBOcqil X-Received: by 2002:a9d:264a:: with SMTP id a68mr16992384otb.176.1585759821009; Wed, 01 Apr 2020 09:50:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759821; cv=none; d=google.com; s=arc-20160816; b=B2tdETmBMl1VqLseKbf1xRxxmqQQpdFqrpMBPaQ3pBlQhpIBPOJ5MaVovx/HwiyHNc 9HCUw57G10fjNIzTh2iJLj6uHcRtgx3I/ESPRfN1d/IY7zam6ZSY7PTAQy1LHc3r//PF aiMG3w1mpDGJeBP4jKCYaz3YKwzxmEg/uCSOLPCpRNLcuiyE201+czmUtarnTbYdKEUv oWLFXs+wzFtAbNkf53cYEZ8YkW+ztaRTRTC2u7ouxqr2B6SoJat5Ck4iVXhQZEJoNFGH 1fwLhR4iDZjz/BlK/74prtwPDy1768CSnMHFUglCSNjHaigtoFwE9VRTVGmvJf0K9Kha TP+A== 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=0ubPW9k0zl8orKPICNFOPNjIdJ07HCLNCy0dVSBHXwA=; b=JmhmgU4PSS8a+L3l/J0yMRsArM3wuiGALXpE+6dQGbpi1RL4Y46ZBF2LCLMCKzlL1m L2K/IIpDfgdf/J9o3AXdwT658VtnRgbPGkSt6GdQdBkDY86d3TlzBAbiyicXICeYgOmL n2wZtOP5pERvFgRQeNah2E3RSzG9wA8+u+ee2uKlQHuqcGwtWAQwc6eWlGevA8lVdTU+ d8J5XTC3Asl4ReYXA1tejn6ijI7Ix1ED24A79g+Gl23JSGtcqjkX3HmupFpR6jfAeri7 KHIiGskgNS21nopyCZjTUPtMgaxPk8rBNvq53fx5hM1/T/6p5QhF2viH6fx5//s69JxA DJuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q2tNbqQu; 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 6si978748otv.76.2020.04.01.09.50.07; Wed, 01 Apr 2020 09:50:20 -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=q2tNbqQu; 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 S2390104AbgDAQsA (ORCPT + 99 others); Wed, 1 Apr 2020 12:48:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:49866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390100AbgDAQr4 (ORCPT ); Wed, 1 Apr 2020 12:47:56 -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 AB143206E9; Wed, 1 Apr 2020 16:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759676; bh=h74ejmZRkUXqWK9qRDs8IjDoU7X8jdD/ST0PfyG2Zlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q2tNbqQujL9cyBUsvE5CL3xqGwXT+M+t6TqXyDakPrIWp7lcIXFVf8iodcOEaNMzU FUAKVkJU+afIH0X4m1v+C7uOIYfAB0sS6ftI5HrTWHU558MsfJaNn39d4X+F5YLXJJ ReqD2br20+1WYg8RME96YCrpuxJBzlrTnvIm7kVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Sean Young , Mauro Carvalho Chehab Subject: [PATCH 4.14 127/148] media: dib0700: fix rc endpoint lookup Date: Wed, 1 Apr 2020 18:18:39 +0200 Message-Id: <20200401161604.577970711@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 f52981019ad8d6718de79b425a574c6bddf81f7c upstream. Make sure to use the current alternate setting when verifying the interface descriptors to avoid submitting an URB to an invalid endpoint. Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on. Fixes: c4018fa2e4c0 ("[media] dib0700: fix RC support on Hauppauge Nova-TD") Cc: stable # 3.16 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/dvb-usb/dib0700_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/usb/dvb-usb/dib0700_core.c +++ b/drivers/media/usb/dvb-usb/dib0700_core.c @@ -821,7 +821,7 @@ int dib0700_rc_setup(struct dvb_usb_devi /* Starting in firmware 1.20, the RC info is provided on a bulk pipe */ - if (intf->altsetting[0].desc.bNumEndpoints < rc_ep + 1) + if (intf->cur_altsetting->desc.bNumEndpoints < rc_ep + 1) return -ENODEV; purb = usb_alloc_urb(0, GFP_KERNEL); @@ -841,7 +841,7 @@ int dib0700_rc_setup(struct dvb_usb_devi * Some devices like the Hauppauge NovaTD model 52009 use an interrupt * endpoint, while others use a bulk one. */ - e = &intf->altsetting[0].endpoint[rc_ep].desc; + e = &intf->cur_altsetting->endpoint[rc_ep].desc; if (usb_endpoint_dir_in(e)) { if (usb_endpoint_xfer_bulk(e)) { pipe = usb_rcvbulkpipe(d->udev, rc_ep);