From patchwork Mon May 13 05:48:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 18379 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Ublcx-0005RG-8E; Mon, 13 May 2013 07:48:51 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1Ublcv-0002MX-1b; Mon, 13 May 2013 07:48:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753230Ab3EMFsr (ORCPT + 1 other); Mon, 13 May 2013 01:48:47 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:64484 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752889Ab3EMFsq (ORCPT ); Mon, 13 May 2013 01:48:46 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf3so2182194bkc.7 for ; Sun, 12 May 2013 22:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=lKOQBNhacb3xQZ0B3nzUNwblDfSPGReBI/4m7wwhYS4=; b=LTn8W2A2WEbw3WiGaeMTkgpgLjmaheSWUO0e3px5wi0BknBTQrLJfOtuB0CdmXn/n/ E4O2wXq9gy0/k/5oPFW0GnrJl2Ji9Lpk9vCUONlDDhPvSEO0ZG/B0yFoHKTtcOoVj1gn avCUmGkp2mVBkXvN0rfFBUdMGZMw28WdTI+I3HiWKqtfpjn8+TuIE2me0f/zmW5cFwcq XSzAFq5RU1ZQxSQLpePQBx0bF3K/dZm9urfRkHTCfVuhQJKbHo+7sWhz10v5WLPzWJN9 C3aA7HOsESAXut4KYrjY6zzT6312OhG6wTBLFAqdNjogfWyu38h23mLKqWuqwzzXLpU+ 5HHA== MIME-Version: 1.0 X-Received: by 10.204.172.80 with SMTP id k16mr5228093bkz.123.1368424125492; Sun, 12 May 2013 22:48:45 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Sun, 12 May 2013 22:48:45 -0700 (PDT) Date: Mon, 13 May 2013 13:48:45 +0800 Message-ID: Subject: [PATCH] [media] v4l: vb2: fix error return code in __vb2_init_fileio() From: Wei Yongjun To: pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, mchehab@redhat.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.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: 2013.5.13.53917 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, 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, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun Fix to return -EINVAL in the get kernel address error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Reviewed-by: Sakari Ailus Acked-by: Marek Szyprowski --- drivers/media/v4l2-core/videobuf2-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 7d833ee..7bd3ee6 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -2193,8 +2193,10 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read) */ for (i = 0; i < q->num_buffers; i++) { fileio->bufs[i].vaddr = vb2_plane_vaddr(q->bufs[i], 0); - if (fileio->bufs[i].vaddr == NULL) + if (fileio->bufs[i].vaddr == NULL) { + ret = -EINVAL; goto err_reqbufs; + } fileio->bufs[i].size = vb2_plane_size(q->bufs[i], 0); }