Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp836417pja; Wed, 1 Apr 2020 09:34:56 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuabcJtAuN15e0168/4JLxk7Os8VynzhoRO41pequwadhzrfW+Eyo+UZxbekcDpYvWRgbE+ X-Received: by 2002:a05:6830:1e82:: with SMTP id n2mr9333521otr.338.1585758895852; Wed, 01 Apr 2020 09:34:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585758895; cv=none; d=google.com; s=arc-20160816; b=JRzzuWhnPoppOHXSpWTT3oDJxPt5NIt8MnPPlmAbFrdMNjr6MFdvtJc2D4BvwgHZp7 sXdmv1nXL28/MI93R7g4pUdmbkqU1HDdiqwDkbVI76pRl3czNI18DceMSeG+fjTRA7+a sXGQbQ/F0mtzWhoJ5DXk7ft5ccKBzUNNr0qDuVuI10VSYp1UoxGG2eqWFTNmxKz77WnP ZokKK4OsdU/OhlAfwfKnZlEQEM/7UbDrmYF9GP5zUGKAe/IlBMNpiSZDIgREYNAo83H2 uVUFNynqGOrY09t/EimGeZdhDZ9fXu/RCAza14hgJTsviJK9/+/dgARdafywKRUQHXK+ puVA== 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=mGE/F2kW1TqdC9QkxzmfSNdePY4SiFzOErPBv/pwB6s=; b=g6OHi9xb+qSlgkHEQ9MlYF3/W57X6pbVJjRTpakwhznjc9r2YgdD4fUIIg1vRpPRRe Uvb61j1r21vaoeOLw5/M/Zgu8P5X0MqyTBh7ymquq8PoEZbsRd68Td1ClXUlCNZ/E/fo NcHhB1c/zUpQM2xsRfSPgSgRqlBOpjWJSqie4T+06Z50piI0GyX3n3O/Sk1dOdWsdMkp wbv/u+zAM5bF3JuUKTWkPYDltESlSFA6b/KK7S9jXV+61XPH4RTIEnNWy4b1tGW3nqdS zV1iLYa/NCh1CRHAmdyG4D3X5JxZ0Ov58ld/2r+z7Ph6266PCItXfvIkvCAXdlL50j1h X5vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dh1XjisS; 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 s4si993353oom.84.2020.04.01.09.34.43; Wed, 01 Apr 2020 09:34:55 -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=Dh1XjisS; 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 S2388089AbgDAQdQ (ORCPT + 99 others); Wed, 1 Apr 2020 12:33:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:59740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387984AbgDAQdP (ORCPT ); Wed, 1 Apr 2020 12:33:15 -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 2C814212CC; Wed, 1 Apr 2020 16:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758794; bh=LI1TXju7BvYNYBqckgk5icjS0KxqsByRTaXflSe8YaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dh1XjisSOW9Ip6nj2KSj8rQ4W6M5niulNcG/3Nei/6V1l6jNaqUi+QKTyrrAgYQzW LhkVdFwUg3bINSbcMkrhMqSwSHKjZeJQyrdwxQYjmdMi8mV2DGNDJG4C3ddsODBPLK XP1FA5vMP8ccjPmhH6Bc4fPIMk9UA5El2DE9HuuI= 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.4 78/91] media: ov519: add missing endpoint sanity checks Date: Wed, 1 Apr 2020 18:18:14 +0200 Message-Id: <20200401161538.246825052@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161512.917494101@linuxfoundation.org> References: <20200401161512.917494101@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 @@ -3507,6 +3507,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); @@ -3632,6 +3637,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);