From patchwork Tue Oct 17 17:35:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 10012611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3427460211 for ; Tue, 17 Oct 2017 17:35:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20A04289AD for ; Tue, 17 Oct 2017 17:35:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15364289B1; Tue, 17 Oct 2017 17:35:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A74E1289AD for ; Tue, 17 Oct 2017 17:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753612AbdJQRfW (ORCPT ); Tue, 17 Oct 2017 13:35:22 -0400 Received: from galahad.ideasonboard.com ([185.26.127.97]:35255 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753172AbdJQRfV (ORCPT ); Tue, 17 Oct 2017 13:35:21 -0400 Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 7280C201F5; Tue, 17 Oct 2017 19:34:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1508261683; bh=+DOu1/Bxp1n7WfccgbuO1TJQ1oAMwmdnUP9u8BinaOw=; h=From:To:Cc:Subject:Date:From; b=k+BVuYnqqKZguUaf3kl1JRBtKHZdqR31w+yJGgdzVFjXTB41lfQVuHwg+NpSwmRSK Ao70KMIxKhk8j1eR/WwI4XuWe1Nm4hsM1YqkOGrpZyq6Y8vgwgETZc4L5JktKHbPuY rcPwOifzfc/IB8c1I95R8pvwemV43kIX4bBKWelY= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Guennadi Liakhovetski Subject: [PATCH] uvcvideo: Stream error events carry no data Date: Tue, 17 Oct 2017 20:35:35 +0300 Message-Id: <20171017173535.8953-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.13.6 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to the UVC specification, stream error events carry no data. Fix a buffer overflow (that should be harmless given data alignment) when reporting the stream error event by removing the data byte from the message. Signed-off-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_status.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index f552ab997956..1ef20e74b7ac 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -93,8 +93,9 @@ static void uvc_event_streaming(struct uvc_device *dev, __u8 *data, int len) data[1], data[3] ? "pressed" : "released", len); uvc_input_report_key(dev, KEY_CAMERA, data[3]); } else { - uvc_trace(UVC_TRACE_STATUS, "Stream %u error event %02x %02x " - "len %d.\n", data[1], data[2], data[3], len); + uvc_trace(UVC_TRACE_STATUS, + "Stream %u error event %02x len %d.\n", + data[1], data[2], len); } }