From patchwork Fri Aug 30 02:17:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 2851723 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 353909F2F4 for ; Fri, 30 Aug 2013 02:17:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 511AA2017A for ; Fri, 30 Aug 2013 02:17:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 743C8201CD for ; Fri, 30 Aug 2013 02:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754287Ab3H3CRl (ORCPT ); Thu, 29 Aug 2013 22:17:41 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:55210 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754045Ab3H3CRk (ORCPT ); Thu, 29 Aug 2013 22:17:40 -0400 Received: by mail-pa0-f54.google.com with SMTP id kx10so1693437pab.41 for ; Thu, 29 Aug 2013 19:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lwxWvm8Z5LGMsrShtH7Qb0cTeunntsBy8m7D4V3OYPg=; b=C0Ub8ik99NvQvzh/LRTgndDKtZ1+9QMnhqtMCYf8jyX+4PUamqGGIPXeEKsWxkBQFf G46HmXH1wvzBA8GLwcdu1jp/9yO7dKeOCyo2Pc/CMgxko211Y6VNhaKMwfZsaehUTlaR bx6HRtUaT3J3lIUagmAKOEP2TFD+si5eI0SfI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lwxWvm8Z5LGMsrShtH7Qb0cTeunntsBy8m7D4V3OYPg=; b=HsyENMq2Pistq1G7PFn34YAcv9t+bwoJakj5/Wdt8UZ/yJ3R4obSh9Rsv23Lyg6kH1 K08GUSb/wQ225OsiPDwOsVQrRbK3zCPTl6Z86d/OCs9X0mL0lA6dMAR3WJSsNbaDBOY2 exaK+nBk977UUHLkoc3aSwDDGwWq1Lt94zjopJAML07u/iug8gaV0vKIC+glsjlf+RMK 2ArzVg4PSEkIePAYf9CnfdddvIpaR/b98baPTTLY94j1MVk+latNR/sShE4jcijyyRoF umNSRZLv8ZfeJp1J+/B8n87ybHq11OG9ytXWIlVFBmtegCMoOEV/nAxpXksy3Dge6kvL loyQ== X-Gm-Message-State: ALoCoQlBfMqTQQV+8QMlKNpL4EG8myk/R+gt9aoFl0VxnmKFSbs/aDsECdxyjxOagzFZv63MIFlu X-Received: by 10.68.225.232 with SMTP id rn8mr6918640pbc.32.1377829059839; Thu, 29 Aug 2013 19:17:39 -0700 (PDT) Received: from kawagoe.tok.corp.google.com (kawagoe.tok.corp.google.com [172.30.88.114]) by mx.google.com with ESMTPSA id ye1sm27935254pab.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 19:17:39 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Pawel Osciak Subject: [PATCH v1 07/19] uvcvideo: Unify error reporting during format descriptor parsing. Date: Fri, 30 Aug 2013 11:17:06 +0900 Message-Id: <1377829038-4726-8-git-send-email-posciak@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377829038-4726-1-git-send-email-posciak@chromium.org> References: <1377829038-4726-1-git-send-email-posciak@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add common error handling paths for format parsing failures. Signed-off-by: Pawel Osciak --- drivers/media/usb/uvc/uvc_driver.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index d950b40..936ddc7 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -322,13 +322,8 @@ static int uvc_parse_format(struct uvc_device *dev, case UVC_VS_FORMAT_UNCOMPRESSED: case UVC_VS_FORMAT_FRAME_BASED: n = buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED ? 27 : 28; - if (buflen < n) { - uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " - "interface %d FORMAT error\n", - dev->udev->devnum, - alts->desc.bInterfaceNumber); - return -EINVAL; - } + if (buflen < n) + goto format_error; /* Find the format descriptor from its GUID. */ fmtdesc = uvc_format_by_guid(&buffer[5]); @@ -356,13 +351,8 @@ static int uvc_parse_format(struct uvc_device *dev, break; case UVC_VS_FORMAT_MJPEG: - if (buflen < 11) { - uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " - "interface %d FORMAT error\n", - dev->udev->devnum, - alts->desc.bInterfaceNumber); - return -EINVAL; - } + if (buflen < 11) + goto format_error; strlcpy(format->name, "MJPEG", sizeof format->name); format->fcc = V4L2_PIX_FMT_MJPEG; @@ -372,13 +362,8 @@ static int uvc_parse_format(struct uvc_device *dev, break; case UVC_VS_FORMAT_DV: - if (buflen < 9) { - uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " - "interface %d FORMAT error\n", - dev->udev->devnum, - alts->desc.bInterfaceNumber); - return -EINVAL; - } + if (buflen < 9) + goto format_error; switch (buffer[8] & 0x7f) { case 0: @@ -542,6 +527,14 @@ static int uvc_parse_format(struct uvc_device *dev, } return buffer - start; + +format_error: + uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " + "interface %d FORMAT error\n", + dev->udev->devnum, + alts->desc.bInterfaceNumber); + return -EINVAL; + } static int uvc_parse_streaming(struct uvc_device *dev,