From patchwork Mon Mar 13 12:53:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 39999 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 1cnPWD-0005J1-O2; Mon, 13 Mar 2017 12:56:09 +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 1cnPWB-0005ea-4q; Mon, 13 Mar 2017 13:56:09 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751085AbdCMM4F (ORCPT + 1 other); Mon, 13 Mar 2017 08:56:05 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35816 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750814AbdCMMye (ORCPT ); Mon, 13 Mar 2017 08:54:34 -0400 Received: by mail-lf0-f68.google.com with SMTP id v2so11774583lfi.2; Mon, 13 Mar 2017 05:54:32 -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=xvHoXhPyM1Q9N5giP/cSCkdpjrT73psEtEm6RBkIXdE=; b=Uya434eaZmkJtDa+TBODXUHE9uWdezt+0DOMldQ5GnbuvLDfvF8zB6vJdC6rTcI43v BNjty/Jmm5UEL5GgRPlH5lhPUvLEHrmIzsZo0Wilhwr4rhmY1CFNWEB0i/RyAwFNR6ky ZpHozbPUDZQ/JFNNd37D8u+tbElizeTegtXI304PDm21bFtjdFJXjw89uV4sGa8FTQs1 y2F/1GjyRIDC7G6VsDWdXmTvblXH1ia+jxcrk5ZgrakRTVs0TDLHByJdMJGSopPQu2oD /KBPOgoYNnP6pgpSbUBYlzEGBxg5Cl+hz1CrWtGWT5S03H3S/4kUvM71qLJb3odiwbvg gDVA== 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=xvHoXhPyM1Q9N5giP/cSCkdpjrT73psEtEm6RBkIXdE=; b=enY9RpWjEqPngzaKuIjF8NyR4jORzkp88yyzEywTeBYX7h5QhjVfy3UVoyVGOoYkRh Q1Cs9/iU4KfQLem9yDgEePF+9dlfGXU1LcRbchVEUgdSBR8+8s9uNiacaMSwS7kDbbTM qxR9oVyAHHdsPBXvq6zEdgJYWB318M8l+Fcxfwd/eSRXur9xpHMfEVsj3eMw9sI2jzPV gWbT1qZ9m3kQEm35zHuEDc7PgEc+PXG70KlgaIaarL0/Eoh5yV9HykbpX3Es1hSmqUOc 20XyKNB12kc68NDgpoEVDyq7YpOk6md0H59Vj32NFppAiBD3gC6DAHvMzbVy3AfzgeI1 eW9Q== X-Gm-Message-State: AMke39m0auGpLjNm1dCsWSDvEHf1GICfYbt5AXNHUqFhyO/veYsJEqMkbyhzEW5i/PQ8Vw== X-Received: by 10.25.31.141 with SMTP id f135mr6768692lff.56.1489409672051; Mon, 13 Mar 2017 05:54:32 -0700 (PDT) Received: from xi.terra ([84.216.234.102]) by smtp.gmail.com with ESMTPSA id 30sm2976866lju.53.2017.03.13.05.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 05:54:30 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1cnPUU-0007f0-3R; 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 , Thierry MERLE Subject: [PATCH 2/6] [media] usbvision: fix NULL-deref at probe Date: Mon, 13 Mar 2017 13:53:55 +0100 Message-Id: <20170313125359.29394-3-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_1200_1299 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, __CP_MEDIA_BODY 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 dereferencing a NULL-pointer or accessing memory beyond the endpoint array should a malicious device lack the expected endpoints. Fixes: 2a9f8b5d25be ("V4L/DVB (5206): Usbvision: set alternate interface modification") Cc: stable # 2.6.21 Cc: Thierry MERLE Signed-off-by: Johan Hovold --- drivers/media/usb/usbvision/usbvision-video.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c index f5c635a67d74..f9c3325aa4d4 100644 --- a/drivers/media/usb/usbvision/usbvision-video.c +++ b/drivers/media/usb/usbvision/usbvision-video.c @@ -1501,7 +1501,14 @@ static int usbvision_probe(struct usb_interface *intf, } for (i = 0; i < usbvision->num_alt; i++) { - u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc. + u16 tmp; + + if (uif->altsetting[i].desc.bNumEndpoints < 2) { + ret = -ENODEV; + goto err_pkt; + } + + tmp = le16_to_cpu(uif->altsetting[i].endpoint[1].desc. wMaxPacketSize); usbvision->alt_max_pkt_size[i] = (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);