Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp841957pja; Wed, 1 Apr 2020 09:40:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtZF7SeXIZM4EpeoqA6BTvG8MC+rWWhPShG9JhyioiSzx3eSJORsjDxmwmp+oLtS03QxZgP X-Received: by 2002:a4a:8604:: with SMTP id v4mr17489160ooh.82.1585759239159; Wed, 01 Apr 2020 09:40:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759239; cv=none; d=google.com; s=arc-20160816; b=g/KXtqt4Io19ZL63ANmw1gloGbw1rdnoN6HGI0Cot4EfG5XRoVS8F6jQKdn3qc+Jtr trJdoLtD/id9C8Q6TdXLl2s6Hex180VJguufBxT/9xDdcBCEWwXpb23XUVQ54UsJ0r4O jvdhwIwvde0TlbKN7iInVyK/LdoxJ/QdoWwDmxMH8EIXiJyH8On7cGaBT6X4Y2FYE+bG vX/T8aBIvhHPysJv6mN9YurChtcLnuzMZdeFgEmwNeuM495zbCK8GgqGSJZzxMQmpC6R nFC3sZ5hEi6ukB+Qiezs0TyAL48G61B4xgvCv0CHrpSFwZoC0rE7v9pbKhy8Rk+Mds/N KDFg== 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=godNmRWwtLrKVGr2z0eSQ8O1ZIpSYIdJRHEJ4Iwtj/E=; b=f1MOKU87oOhtg1qFG2PPAnlu461rgNovG+kjSCd1m1Tq/jLtkn29ZcpQlWtVu2H8dC p954/OIWm0XHrGSNxzaaRx/UixuVYyoIwVkuHVnAawo0SpCOtsemW9+ig13gkDPFEe36 q774UffjkXB5NH/6Xw5L5BeNihzrALOke870MyUb0KUwdM9KjrecL/mLARN2k3BeDbHY EB/NO1SnfKhhwH2Q+1CItzt0S6xqktQja/E0DTesywrk4J6rDD4IVmCKcKgzFzEvbPdL N/JLmO+y4hAZSgtj0WMKtc0nboIhL9LmNia80dm5zqdsNBnWZZqCydKn93cLikGEfr5K B58A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ASNVZMZj; 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 z9si1162673otj.157.2020.04.01.09.40.26; Wed, 01 Apr 2020 09:40:39 -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=ASNVZMZj; 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 S2389266AbgDAQj4 (ORCPT + 99 others); Wed, 1 Apr 2020 12:39:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:39998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388679AbgDAQjy (ORCPT ); Wed, 1 Apr 2020 12:39: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 DF46420719; Wed, 1 Apr 2020 16:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759194; bh=Vb7rH95H+cRLRZgwZr5PFtUUZF7nYM9p+VSLhDZaSGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ASNVZMZjpip4M9pEP2XUqeYWLZGbg8FdMlYA7PpPGkS3iLuPBAL9UcRNAfUFUsKYd sP9gKneb2dSxp4vF6YJqI2R+RA4FwHmUiTZD0UtkEwRTpz8/4RKeerCaMLzfzbeeMK St2hxQUHBnps4m1M9dNiOdKTA9UQomJEKj77Cw60= 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.9 086/102] media: ov519: add missing endpoint sanity checks Date: Wed, 1 Apr 2020 18:18:29 +0200 Message-Id: <20200401161546.780346676@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161530.451355388@linuxfoundation.org> References: <20200401161530.451355388@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 @@ -3482,6 +3482,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); @@ -3607,6 +3612,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);