From patchwork Mon Aug 10 17:11:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 30808 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOqcP-0007X1-2I; Mon, 10 Aug 2015 19:12:13 +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.76/mailfrontend-8) with esmtp id 1ZOqcL-0004Fm-lC; Mon, 10 Aug 2015 19:12:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754691AbbHJRMD (ORCPT + 1 other); Mon, 10 Aug 2015 13:12:03 -0400 Received: from mail-bn1bon0110.outbound.protection.outlook.com ([157.56.111.110]:45865 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754522AbbHJRL6 (ORCPT ); Mon, 10 Aug 2015 13:11:58 -0400 Received: from BN3PR0301CA0023.namprd03.prod.outlook.com (10.160.180.161) by CY1PR0301MB1308.namprd03.prod.outlook.com (10.161.212.18) with Microsoft SMTP Server (TLS) id 15.1.225.19; Mon, 10 Aug 2015 17:11:56 +0000 Received: from BN1AFFO11FD028.protection.gbl (2a01:111:f400:7c10::137) by BN3PR0301CA0023.outlook.office365.com (2a01:111:e400:4000::33) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Mon, 10 Aug 2015 17:11:56 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD028.mail.protection.outlook.com (10.58.52.88) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Mon, 10 Aug 2015 17:11:55 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.38]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t7AHBqYw026891; Mon, 10 Aug 2015 10:11:53 -0700 From: Fabio Estevam To: CC: , , , Fabio Estevam Subject: [PATCH] [media] mantis: Fix error handling in mantis_dma_init() Date: Mon, 10 Aug 2015 14:11:41 -0300 Message-ID: <1439226701-5896-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD028; 1:LsQaPeB4rHzVghFyWF9smnYT5NsTp6MtXVNfhAsnW3mSW3i438pdE5Bi/47HyYzZXs4++GoE2/a3QiMYX2eUDlwylG5xaVI6L4AWVESG/t9XbTU1vqHXj+ttAZovsjlK01JN15/erZN1Y4kICuPdCgpl/v8bvFY+4P5mId7RLlipU/2FDeGbQCYXFpg1QCDBFk+AbkO5xtip58WfKyCNAkdxHrIq0GZYD9uTXTbhO6cWl0SM3Y7F92nhKY1DTxB31Hn5ktuP4REIwYGkMclBhBLIp/pjl+4w+qaWD0D3tBSOyHS54mJS8i8/cW/LDwMB312J7H66WAGJMV26q7JUNA== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(46102003)(47776003)(92566002)(48376002)(36756003)(106466001)(105606002)(19580395003)(2351001)(64706001)(50466002)(104016003)(189998001)(229853001)(50226001)(86362001)(19580405001)(6806004)(97736004)(33646002)(77156002)(62966003)(87936001)(68736005)(77096005)(50986999)(110136002)(5001960100002)(5001920100001)(107886002)(85426001)(4001540100001)(5003940100001)(5001860100001)(5001830100001)(81156007)(69596002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1308; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1308; 2:PNegyMANRIFGQyB0zvfGA7L2DGM7b6uk6c2xQd0RRnnss1WRvTowqD2s1HbIzzkB5qYszIg7ymKUfHCJCx6S4vWkuUIZe9ztB3hVYQNDgsIHNe4hJW0+CHaYtCmqawVLQnjSSyT35N1ctqgrAjojwjKVN4NUlXAV4Ps9Vq+U2hg=; 3:Vt+W8Tb5ebaU90muFifiULqy5rd5ztkYk523Br4PNNGhl62LG1NjyhTZbDKeBr4Pqhips9HaUk580wBz5tOd8QtLiTnuYXpNAdvcpsxJ3/zHfu2xJcrZyPaHx83Q98CDczMPdpNRavSdi6bTMb9ZujcguwDfiROak7qAsGmMrLLz917IyG82CDuR/4OyojJUTe7+ST4c+vKM2OWr72zHOn8xpSMML5eTApvUvxJbFvs=; 25:KiNKnC4Qtjtlrsd3sbTJ+BXdgaXKGGjNgtb2KGACxreP15dGVuoobUYUiS9aIs2WzLR6QkPY2Y6DFnkCM60BBFUjsDpPpw3AZ3EjmcDO8Ttxnnd4jxIwWc2uplnnHAxY5n+CtuLm3EGbLBCvUsZAcpAgmZ9ygR+vxEuseU/WlzrKA/Yz5CSY3m6LTwRM26I0OCzVwU/k8KK1ebmICSWe+68Ug1nHHWEUssygqYJjxnUAd9AEb6CBxjwhQOgC30e+gjqUwubJVYAdS/RNUMLHJA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1308; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1308; 20:yoAuPDsYybbM4kiXLNxpmjrgnw17LVWwZZAFH0JYp3YbQO+Oc6sPNR9Llm29iq9KdwqK4YM//ieZEfz1+LG/S4/0E6dnRJ+jraYAjANamRsrBsLk29e4/cfZcdko5ocdztEgKa7f81o2XCrgdNeS/oN5rLc2iNFLCHSI6lccOmdYxjMqK+3d6FGaKt8ufwZe1X6BtSSHHNLJRGpagrc0b1yjwTSUjbn7+G8jyfkG9L4BuILeL86zrZD1+H2sSMehaoI6Q+idicqPpTUwjcfqzblGZSO/wjypfWkJ0TVKbrEVmJ5rEcAA1twj5do158SuQclVK17tSS3QCDTGBNJcmLIhRaTr9kFyJ3OWPPV8TjM=; 4:lBIcycrkczL89T2fS+kYtNkdLg1aovNEHP9YLmYjfm1tMqxHwzXrK+xtAiN/E2QRMbjXH4UczFqSEcMXo8n3ypeHB/tO05d8KX/65vtR4C9O+aRHE2fsSotqSv2Nx90iXDEUBy+Qw5Mht4ZP3LsmYFm+zKMhGGwVKqhQDDuqeWqP1WIVUAtdSyLJGGvTWy3wvu2ozJX3h0q8XQ39rqSmd4pPJ8LvblwfwvlW1I4Fu+HaTfBx+EbIaI/nRuGCJRfbJlhcI0Wodue62g05FEtAEvsCmmXPc5ENgpxZhC0zxRA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR0301MB1308; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1308; X-Forefront-PRVS: 06640999CA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1308; 23:oNf/lAdazKkNuU3pVnO3P0Jk/cvhPOZUJ7Ag4Tg?= =?us-ascii?Q?vUnB528P70LKicO2VH+a9bywT8u/AuumRyltrk9iGef+UDvkIhwbg5xi8+Zm?= =?us-ascii?Q?w3t6YzAxgct2pqcnUWuxRXd9qLPYm8nJghcesBLXgm//FQ7yw6dJovhnReV0?= =?us-ascii?Q?Nh+IpDsB/vvMRNjHW4VrgL0h5VDRqqsYyy+WlefG5mRRLoUcFfmmOtKt5Mzi?= =?us-ascii?Q?KHZp0TD/kLxb6tcLQR+9pGYdLfLUX3k3vK8nmb18rU53Pp5L/EnZ1wqx/dLM?= =?us-ascii?Q?G6L64JvxjsnIEmyZn+gTLNOr+J6v7c11C6Za/5BBfab5nzvzZLOH3BZsJ2MP?= =?us-ascii?Q?dr5DFCM1q0+zmj5oZRr2sJePZ/ILRYsuNzsMUgNtZp24mnRiKQiVzMTGq5NY?= =?us-ascii?Q?0Ev1gVClkefCrA7Q8dJHXyy1fwWUntJ3Wwj89RJ6SBeWJjzgZq5gCQRW3S21?= =?us-ascii?Q?uBu+jLl6bmaLopNSA0GOxPn6pOWO+mOnNwSbwPU7oEjpwR0IlejzwaAclOwG?= =?us-ascii?Q?eYnUi/cEzeviTHIo+xcuLHbrTOh81oz0aLCb7KrBnMzmjkDMd43DpiYLz/76?= =?us-ascii?Q?RJ5NYkMljG4juvRdVA5myZ4Cc0VMDtaaP3a9+yn4jBWR9Us4k6u4wZq8j/aP?= =?us-ascii?Q?5xDdtkeVmNmGbOP8/NfpUc72vKUAcyT4IHwQyUcq+exG3zRWQOOPIbfNxYhO?= =?us-ascii?Q?nTGw1L9NqnaZtjECjSdXtnu+0szrm3yi/tKEc7r41vAuSDUBQbyIP5rr9k+u?= =?us-ascii?Q?DASOjsSSwqAi2LGdQXI+0te4SnHV49biNc9Fb7VEbRTrP4hHtsGUsJDTd/nG?= =?us-ascii?Q?ul9nultU4SfWcdCa9Gqb5UE8pBssGSR3VApDEn9WDeG+7NQKJVg3y3hNFZW1?= =?us-ascii?Q?Cvbw9CCLvaEGDh7Tv/u8PACEOxR7wUun5/UkgB9PyR8Xrdt4vI6upgQXSI10?= =?us-ascii?Q?4+pGjs2QTQUviWrEigrQNt+EuXtMMCKdhqG3nQfWAt05erZUKAvTTAs7X9pR?= =?us-ascii?Q?1aPQvqM9++ABtre/+Iv0KRS3wkuJdZA7iEOk9x+eOglQGaerQclxRUtNb2rS?= =?us-ascii?Q?zFmEr+wjI1Uu+PcxRJ8F9pY9Bi6/XDgYfXj6E5dh+LP1Q9a6ETXaHN093fn8?= =?us-ascii?Q?1bPvp6/0CVAcKkwYZSzP9wH6xqCPq29iviamIrE/f081CdgqQLN2ibQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1308; 5:9OTNn+ww2NGaFoYSq/RIK7opgAtQqnXxr4tjZpyXNj8Rgct1NEG0BOcFtaZfcInhVqau4JBP6TW5U7vrbM3nQNLYIBJispz6q5AeEONeyGwajAUms7bLuNY99gW29wrS7niDPmXwSPtO3kvouT/W+A==; 24:wlqDqPkzV2s18bDWAOZIGk2Be2j0hewWInwkjOjnBblVT6POr5XQ4j6Zomz/zSHacVEq6TRl5scTAe6jB3CMpEDBoYa/PQgWWIrDj0YZH3g=; 20:y0hs5IuHFMpBO9oVmZrgtYT2zV0QPXIk/klLNok9HGjQVcfKP8uNnw20AGTDw/M3eYYaKBbpa8RxLksK853fhw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2015 17:11:55.7956 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1308 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: 2015.8.10.170315 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, NO_URI_HTTPS 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS ' Current code assigns 0 to variable 'err', which makes mantis_dma_init() to return success even if mantis_alloc_buffers() fails. Fix it by checking the return value from mantis_alloc_buffers() and propagating it in the case of error. Reported-by: RUC_Soft_Sec Signed-off-by: Fabio Estevam --- drivers/media/pci/mantis/mantis_dma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/mantis/mantis_dma.c b/drivers/media/pci/mantis/mantis_dma.c index 1d59c7e..87990ec 100644 --- a/drivers/media/pci/mantis/mantis_dma.c +++ b/drivers/media/pci/mantis/mantis_dma.c @@ -130,10 +130,11 @@ err: int mantis_dma_init(struct mantis_pci *mantis) { - int err = 0; + int err; dprintk(MANTIS_DEBUG, 1, "Mantis DMA init"); - if (mantis_alloc_buffers(mantis) < 0) { + err = mantis_alloc_buffers(mantis); + if (err < 0) { dprintk(MANTIS_ERROR, 1, "Error allocating DMA buffer"); /* Stop RISC Engine */