From patchwork Tue Apr 9 06:18:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 52446 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 61A894D3A; Tue, 9 Apr 2019 08:18:41 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150078.outbound.protection.outlook.com [40.107.15.78]) by dpdk.org (Postfix) with ESMTP id 2C4BB4D27 for ; Tue, 9 Apr 2019 08:18:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HHNyNLE4JW7lJXHZpyHv7FGQtb/gwOGT0VnjXap0r/0=; b=Z1G6u+qCbOlF7kr2ulpJnnv/r5/h2VXGTDK+F6bPbQUsu9BZ49qihbMibkix5AmCwb6WoVGApWmUPqbnH3Eh2azDKHtJMI9n/voM44Tg6a97sTImqIXvPR8hLmk03MZGNkL9x9jZ4ZqDZDzsdnbLKEd96s3C2gs2uJVvvFAYxxE= Received: from VE1PR04MB6365.eurprd04.prod.outlook.com (10.255.118.78) by VE1PR04MB6621.eurprd04.prod.outlook.com (20.179.235.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.16; Tue, 9 Apr 2019 06:18:38 +0000 Received: from VE1PR04MB6365.eurprd04.prod.outlook.com ([fe80::f5ad:f178:4c55:13e0]) by VE1PR04MB6365.eurprd04.prod.outlook.com ([fe80::f5ad:f178:4c55:13e0%3]) with mapi id 15.20.1771.016; Tue, 9 Apr 2019 06:18:38 +0000 From: Gagandeep Singh To: "dev@dpdk.org" , Akhil Goyal CC: Gagandeep Singh Thread-Topic: [PATCH] crypto/caam_jr: fix memory leak and illegal memory access Thread-Index: AQHU7pwSe2QXYzy/CU6gZKW516Farw== Date: Tue, 9 Apr 2019 06:18:38 +0000 Message-ID: <1554813675-13955-1-git-send-email-g.singh@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BM1PR0101CA0024.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::34) To VE1PR04MB6365.eurprd04.prod.outlook.com (2603:10a6:803:12a::14) x-mailer: git-send-email 1.9.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=G.Singh@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.120.1.67] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cbc74178-915a-48ed-689c-08d6bcb3344e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:VE1PR04MB6621; x-ms-traffictypediagnostic: VE1PR04MB6621: x-microsoft-antispam-prvs: x-forefront-prvs: 000227DA0C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(136003)(366004)(39860400002)(376002)(346002)(199004)(189003)(186003)(2616005)(3846002)(6116002)(102836004)(8676002)(81156014)(81166006)(86362001)(68736007)(72206003)(6436002)(6486002)(97736004)(14454004)(5660300002)(305945005)(6512007)(105586002)(2501003)(486006)(66066001)(99286004)(26005)(4326008)(476003)(316002)(7736002)(50226002)(71200400001)(110136005)(71190400001)(2906002)(25786009)(52116002)(106356001)(53936002)(478600001)(6636002)(386003)(6506007)(8936002)(14444005)(256004)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:VE1PR04MB6621; H:VE1PR04MB6365.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: I1T1Ci3Tw5THyYVnWTowCiq6btmYijK9KBGIXcZQXI6EmhXA/0pn7lFRe2YY5vzwXgY7ZabiTQRzCg9NMNBoGIF41Ora1R+Z/EVjIXn2a10kOHcndWDIcCSOll7Wgi4ath27h3lgmyE+it43tdcVjUyWVFuNs/yQ1A1LXr1PORDsJufTIHpPzONlpqaNv7zj/mRKZ0iK6dwAGdmWw6VfCz9IxiVkiTyf2NaqqwsPwXVA8k40XB4vcOEy2wIUDkAqB5GmNxf3XFhImggoM97ko3hxX/FWpNMTWR4/EzlGh1ajgOSOqY+OsymUf7YzOpcIxouopWIvU56+yL0u7rNSYh4YqkEPGaKtIonUSF084jAbyNpDi4wB0RHlv53v/FCrpOSBVg8DlLpTnrfWyFpJV0kkeF73S1kZK53UpfSK0oA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbc74178-915a-48ed-689c-08d6bcb3344e X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2019 06:18:38.6348 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6621 Subject: [dpdk-dev] [PATCH] crypto/caam_jr: fix memory leak and illegal memory access X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Opendir() returns allocated storage which must be freed at the end of function or in case any return on error. so freeing the allocation using closedir in an error case. Coverity issue: 323507 Coverity issue: 325880 Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations") Cc: g.singh@nxp.com Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/crypto/caam_jr/caam_jr_uio.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c index bf872a2..afd75c9 100644 --- a/drivers/crypto/caam_jr/caam_jr_uio.c +++ b/drivers/crypto/caam_jr/caam_jr_uio.c @@ -362,8 +362,8 @@ job_ring->register_base_addr, (unsigned long)job_ring->map_size, strerror(errno)); } else - CAAM_JR_DEBUG(" JR UIO memory unmapped at %p", - job_ring->register_base_addr); + CAAM_JR_DEBUG("JR UIO memory is unmapped"); + job_ring->register_base_addr = NULL; } @@ -445,7 +445,11 @@ uio_job_ring *config_job_ring(void) ret = file_read_first_line(SEC_UIO_DEVICE_SYS_ATTR_PATH, dir->d_name, "name", uio_name); CAAM_JR_INFO("sec device uio name: %s", uio_name); - SEC_ASSERT(ret == 0, -1, "file_read_first_line failed"); + if (ret != 0) { + CAAM_JR_ERR("file_read_first_line failed\n"); + closedir(d); + return -1; + } if (file_name_match_extract(uio_name, SEC_UIO_DEVICE_NAME,