Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp829763pja; Wed, 1 Apr 2020 09:28:31 -0700 (PDT) X-Google-Smtp-Source: APiQypLYTz81OYR987Lkh5y2R+aB4uATuLQj7jrO4EY7JR9CnUPum7Ud5Ik2d/04e4ZcdugHnA3n X-Received: by 2002:aca:b1d4:: with SMTP id a203mr3511777oif.91.1585758510811; Wed, 01 Apr 2020 09:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585758510; cv=none; d=google.com; s=arc-20160816; b=zyT2S7Ey4za8b+UYJwlOprU91ocWW9JT9MMelIvuxkxHjGJ01JE1P6T0GahFmM3XrT 4iikxpGSX+MS0Ksiu6S6/Hn91DOffmLVHIZhe28cDVwtBEnvKTWvpazgcKwMMyIdHI3P h2CvpeUNjPUSk/oxC6UNgtKViPkz6byFd4at4keASuht/qfXg58w0mM++WpYJui0QVdE w5m9Z8Rawp+uwfVfPOjy/SOQz8z6lwVrE3YT8ovkTXm3iPtrWASweP/V+8IWq0qrsZv/ NvvxYedc++A+4QxYYNitRGsUsW0lomXQIQmTYG54pzILLiKcW5YRyHpbNFatNEbALydw /ZnQ== 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=dag4s/bc7RkSEmpLmJsDUVwmgSyz4R6KrBbP/ZLtL8c=; b=fl58r+eboRtuyNDYBt20Py/fUbnkecdp8sxSP7v/sVekbBo9WM1yww1mumXOCklsi1 Zs3UjlHrIYEdu2MTJw44ZQsb5O3IKScmQbMQr6YKlcB0SiV8lDjUbzxyvaUEVucXIk7V oGewhWuY+9u6pmzJm0pNx6OoepDeQMuUBVyb8WLHQy+dGsF9cN23388m3Pu1HDB1o+RS 8+W1uQpYhvCVq+UKMkY6MmiFDGkKCjtwadSltlpkTH+v7oUvyvnmZ4RlVZejZjuwh25T /kPYuP0gxkgsfGOQBlJmGSY9vF0cAUUjGDIDdFXl57fPLNw7IMsY8yxHBVt0M5a1mjrI s8Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aT0AKtmI; 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 k193si1029076oih.78.2020.04.01.09.28.17; Wed, 01 Apr 2020 09:28:30 -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=aT0AKtmI; 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 S2388015AbgDAQ1W (ORCPT + 99 others); Wed, 1 Apr 2020 12:27:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:52106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388014AbgDAQ1U (ORCPT ); Wed, 1 Apr 2020 12:27:20 -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 772A720BED; Wed, 1 Apr 2020 16:27:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758440; bh=BHMbDdgp7RbDFwD7URLVyuS3BFawG8VCdPBkWkNinL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aT0AKtmIpQtaRNpUcKXzaz+SvjLYowjYGGZb3cHCMXeLu9Vfy1wu33Cr7e8s1E1fG 1YMkHgWLT1k6BGzul8PGknk/Nvbwfjlg65H5qQejv89AgtPMiWVnxmL+ooekoiSb5q 7xKEbe5GGSEocB8NeoljnRVzK0xSBzlsb1+N67SQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Johan Hovold , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.19 092/116] media: ov519: add missing endpoint sanity checks Date: Wed, 1 Apr 2020 18:17:48 +0200 Message-Id: <20200401161554.186885704@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161542.669484650@linuxfoundation.org> References: <20200401161542.669484650@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 998912346c0da53a6dbb71fab3a138586b596b30 upstream. Make sure to check that we have at least one endpoint before accessing the endpoint array to avoid dereferencing a NULL-pointer on stream start. Note that these sanity checks are not redundant as the driver is mixing looking up altsettings by index and by number, which need not coincide. Fixes: 1876bb923c98 ("V4L/DVB (12079): gspca_ov519: add support for the ov511 bridge") Fixes: b282d87332f5 ("V4L/DVB (12080): gspca_ov519: Fix ov518+ with OV7620AE (Trust spacecam 320)") Cc: stable # 2.6.31 Cc: Hans de Goede Signed-off-by: Johan Hovold Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/gspca/ov519.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/media/usb/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c @@ -3487,6 +3487,11 @@ static void ov511_mode_init_regs(struct return; } + if (alt->desc.bNumEndpoints < 1) { + sd->gspca_dev.usb_err = -ENODEV; + return; + } + packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize); reg_w(sd, R51x_FIFO_PSIZE, packet_size >> 5); @@ -3613,6 +3618,11 @@ static void ov518_mode_init_regs(struct return; } + if (alt->desc.bNumEndpoints < 1) { + sd->gspca_dev.usb_err = -ENODEV; + return; + } + packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize); ov518_reg_w32(sd, R51x_FIFO_PSIZE, packet_size & ~7, 2);