From patchwork Mon Mar 13 12:53:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 39998 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnPVy-0005FG-UM; Mon, 13 Mar 2017 12:55:54 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-6) with esmtp id 1cnPVw-0005ea-5h; Mon, 13 Mar 2017 13:55:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752337AbdCMMzK (ORCPT + 1 other); Mon, 13 Mar 2017 08:55:10 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36578 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbdCMMyg (ORCPT ); Mon, 13 Mar 2017 08:54:36 -0400 Received: by mail-lf0-f66.google.com with SMTP id g70so11735232lfh.3; Mon, 13 Mar 2017 05:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dmv/qVFfqQoRDghu0tqVOaeDAtj9d8duhJNVI5vWYMA=; b=itsxiJYX9x7qtUV94WB2HOFFIdSZU+m3DC7ewjLMzltS9mbG8nIjaXD8OE1+udKTV/ fYHYEge9WXOB+SsxgN5kc9OHp+7n3WpA/2oCB5E52uDpgMqXpUGSwPVIkhbgSYQKlWk6 lCos6f/ryiNzyRFDbRIEBP3i5dXG4iUUw0Z1R0I42FdFWeUeWetufBVjmbHzutMxul7C ZuR2YIHtHOLzezHsWLQEqFjePmJar8hfiIdzqwZUdpfwaqA5cfd2bgRlI/PvTDS2da1A FsIor5WKQinOl1sNIRi25jOIcv3gNHJw1u6A9RLPw/m9V3hTyPQYpg0YB5Y7HlDP/bSM tIBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Dmv/qVFfqQoRDghu0tqVOaeDAtj9d8duhJNVI5vWYMA=; b=pFE5Pge01VMvrR2y3KAp27ATdQY+pDsigzWBaTPjI6TkkVLdyOs5oU8ACW8sZaA0HV v6XasHA7dH8V/g8B2FamZllQW1kazqrGCce9FNa1KYyGAxfT5zI7F+DbfHkVa3xJg6In 8XCgEqRyrC6EOXMuBE5YslqwuCm4P4Dt3217GXv6NQ7RZqu62dPSSC0XhiXacJLjn+PH TrZxf2kNklWvG+MvSSCWBJKa07RSq/zGdbsY8JTyXrRMbFVaSd8f8i+fnMZOSUyrI6vW N7NQmNDdhzmqW2tGkKlADg74IJ6RmZeDECuCrsgGSZUcKFKoG7d1PgUusYqjG4mvVbG7 TkGA== X-Gm-Message-State: AMke39nKsnZw0lj8UnkSfnBSCMX3LTVpujVeApgVLM1MEN0BQDAYR7OzzJQw+AkTS5Fj4A== X-Received: by 10.25.196.8 with SMTP id u8mr7971697lff.21.1489409674117; Mon, 13 Mar 2017 05:54:34 -0700 (PDT) Received: from xi.terra ([84.216.234.102]) by smtp.gmail.com with ESMTPSA id p27sm3707529lfg.5.2017.03.13.05.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 05:54:31 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1cnPUU-0007fL-Ez; Mon, 13 Mar 2017 13:54:22 +0100 From: Johan Hovold To: Mauro Carvalho Chehab Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable , Hans de Goede Subject: [PATCH 6/6] [media] gspca: konica: add missing endpoint sanity check Date: Mon, 13 Mar 2017 13:53:59 +0100 Message-Id: <20170313125359.29394-7-johan@kernel.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170313125359.29394-1-johan@kernel.org> References: <20170313125359.29394-1-johan@kernel.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.3.13.124518 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, FROM_SAME_AS_TO_DOMAIN 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_ANY_TO2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __TO_SAME_AS_FROM_DOMAIN 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Make sure to check the number of endpoints to avoid accessing memory beyond the endpoint array should a device lack the expected endpoints. Note that, as far as I can tell, the gspca framework has already made sure there is at least one endpoint in the current alternate setting so there should be no risk for a NULL-pointer dereference here. Fixes: b517af722860 ("V4L/DVB: gspca_konica: New gspca subdriver for konica chipset using cams") Cc: stable # 2.6.37 Cc: Hans de Goede Signed-off-by: Johan Hovold --- drivers/media/usb/gspca/konica.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/usb/gspca/konica.c b/drivers/media/usb/gspca/konica.c index 71f273377f83..31b2117e8f1d 100644 --- a/drivers/media/usb/gspca/konica.c +++ b/drivers/media/usb/gspca/konica.c @@ -184,6 +184,9 @@ static int sd_start(struct gspca_dev *gspca_dev) return -EIO; } + if (alt->desc.bNumEndpoints < 2) + return -ENODEV; + packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize); n = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;