Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp849862pja; Wed, 1 Apr 2020 09:49:08 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt8DMwokQ40Q/LLSI3aT4FsZW9V23upvO6XyqFVxzsUWQzek0eJONqfTIzujgpihVlXstLi X-Received: by 2002:a9d:4c8a:: with SMTP id m10mr17693015otf.114.1585759748056; Wed, 01 Apr 2020 09:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759748; cv=none; d=google.com; s=arc-20160816; b=G/jBsbjyU1JJIXEU47eQXoNPHYhsHZCgpy15HWU7/msD/FidusE8Tri996pvdQl7ro 5oUuwuNeLUR9nDYrW0bms0cPM1CyTZF2cEbP0kwTcb09B7vtlrl4VgKZHgsm7HBcYHla yFjNUzvJeyWSvV2KiW5SbeYDtkP/stMsiZ99tGZdeCwyjATd/YLMQ2SE0I/06wA9LGc5 aVPR6iTqgUxz17d1zuHyuBc/Ux1oyFRTyFF846mf+rLpPQiapVnSNtrKYAxTlhPaGHTW PDJA/glEn0A8iO1Ect5leJEhtJlKGYGtF4IjixY4lpw9banO2MrNk8HIdVl2WB4goX7b jp9A== 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=O9RsvSgfEk6wTFWt5dxZAq/vtwUZsc+uSLZRpGQ+55k=; b=ixZRP1Lc+KXrLWagSL4T2HhBzSrjphDcoH51DNtgAf/TFMhSdRJlWhTag2fnM7QHzV OoSaqwAfrl7ftZzF/CnJrY4jJZQjGDiz0RS5zPtsAvPxaFOFvtYDaQk8rmVk8V08X9Nz /K7ppug1tjBo8rYEhY0w7oGxwFZH24Rdo2NCWwmE0lln3Fm2mI3Sp1l+tPsEC3OMHAOX AoVyyffZ1pc6HWgNZ+o7Sq99FEzbwHRtYszMWeCuHjjO5/6ErKBMYaPk2OMMLsVJxb90 Wi0Ougqp/GG1J+cVer3J1SVBdWTu5wq0oEgsBao9QCwPr8NRvNZSovffm/5rooMk7oho xfVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Qnx09vuT; 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 u19si1130852oth.240.2020.04.01.09.48.55; Wed, 01 Apr 2020 09:49:08 -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=Qnx09vuT; 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 S2390099AbgDAQr4 (ORCPT + 99 others); Wed, 1 Apr 2020 12:47:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:49818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389677AbgDAQry (ORCPT ); Wed, 1 Apr 2020 12:47:54 -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 132522063A; Wed, 1 Apr 2020 16:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759673; bh=2ylRiHjtK90gxi61cOd673GSv59weoK+DS/Xe0pyLX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qnx09vuTLgJJ57e5NuFtc4Zs+VrQ4CAz2lM5gXosMp0MyVI235PH8apwUcE6wG7p7 D0y3uTBUm3pVAZvDTyETa/WRLB/k4iLtEGSDbarhIG8gyEUaiO/LL8FojBOGEbvUXy MULABzy9PpOWcChlBhqAEKVXh5FKquBPvTGe6Rpw= 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.14 126/148] media: ov519: add missing endpoint sanity checks Date: Wed, 1 Apr 2020 18:18:38 +0200 Message-Id: <20200401161604.489452271@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 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 @@ -3478,6 +3478,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); @@ -3604,6 +3609,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);