From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752585AbbLKS1Z (ORCPT ); Fri, 11 Dec 2015 13:27:25 -0500 Received: from mail-bl2on0136.outbound.protection.outlook.com ([65.55.169.136]:39880 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750941AbbLKS1Q (ORCPT ); Fri, 11 Dec 2015 13:27:16 -0500 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: "J. German Rivera" To: , , , CC: , , , , , , , , , , , , , , "J. German Rivera" Subject: [PATCH v4 09/11] staging: fsl-mc: Fixed bug in dprc_probe() error path Date: Fri, 11 Dec 2015 12:09:47 -0600 Message-ID: <1449857389-2506-10-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1449857389-2506-1-git-send-email-German.Rivera@freescale.com> References: <1449857389-2506-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD047;1:xZjKZB+uUY52A4u9/YFfXpfT+p2AIBrWBFT3yT4yl7Z51DoPGU63veLQByEXUIz+p8Yq2eAai6H7CW32xIgtinj8KJkTN3gwMlPlybSZ+doaGrCUwztcFZRSsJx5ckwG7WbOEN0eDdZNuLB9lSy2WkGuy8Jg+SFzYiKHP+kimwmwsTojF1O8fvGpOm3aTthVTE+0OIv6TP6AJ4YNJIAFjUqMZCBBNwwmYkKMA7uclxgwjPDhADnz2MkLKeASASdYYx02beWWhIoIvZFw6BCzfScboELs3qlXehflts3As53uqydIQov0IFiSaVcHowa2t/hjdY3kyX0bCP6bKDXy42C9mmyl1n5zDooIWhKK9M4WpTFp8MgKXv0ZgHA/e0Y1CovXYQMyMif51LhbcbAYWWvxQhCE/SgGIGtvLaGrfntRhmGTJeaN6Elpdbf8t3UL X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(86362001)(76176999)(47776003)(2201001)(50986999)(85326001)(106466001)(87936001)(92566002)(77096005)(2950100001)(5008740100001)(81156007)(1220700001)(1096002)(50466002)(5003940100001)(5001770100001)(48376002)(11100500001)(36756003)(4001430100002)(189998001)(107886002)(586003)(5001960100002)(229853001)(19580395003)(104016004)(19580405001)(6806005)(50226001)(97736004);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR0301MB1304;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1304;2:s2AxsvNnNGs1SwSDLldON14aw1oQiU4/twAO6tbsvA3dNxPyQ9gExinh8kvB7FrFdElzPaVepA03FmP1qWUU80y6daPxbJAlRrG7Xqe4YuUAkznGCyATDgrRWMtJhpofB9VgPhlwIdBN15bat4MgGQ==;3:T3dZiOj+uHPSyIDRHnT1vrXOwm8ZZ0R4gRd7Esp6ed4yEjRiJKZ1F9L7sQ+G2VGO7D8lGnnlzzM/nxRwycGbzrMaffddia45Ci7hl80kprIENRFrI8hXnLeiPBERY2Mx0pn9JEb1EcTrMUZAFNF9et2bK+nJqkO4wOOi8LedL1KEd58n6zYZ4uU03RgHe0w6fCd/w2sVLhEkEPfYXieD0Jsm6pLWeaWqP7WV9Yu2R3I=;25:KjJTf2YxhqaKoAs72aon1G0WUXFUKDDW2zmtmktJ2ASg2Jz/ZYke60wOZHBGcu0lzGCCnF9wVEH3gnQ6IcWukEn9hy0Vmt9ObUb4to1FfVVzlF6M/QzKwiFOfscCQuSakg6fvsVf7Yt/fldXbzncHcwd7tRdasWO+Pre2M982QjBjH1CKMdqadQA+5LgLtSiDd7GO333geOem//S1Jk4Xp8JA6w+x57AVWW1dowWXhSKB5mrovXYhiYNQl48nJ4E43iSFLN2E7Pimc4fHUnByg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1304; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1304;20:Ubpb+KmChmKTHUutdFh6Jfd8eHL8n9tWl1STtsYh2LwEDaEokVDxlEcNVuwcUgwa3MoNBiATWhWoe6B2PsCnC3+UfXZEtNuHWOCQDZo/IT615YJqwRiBCmMo7GgZqVfkgaLcA7IbKo/B31LGDWVjcKs1hr6XNJwHzkPa0ka22/vlzc+9jKpEV/xu5ict9DOctGAKl9Qr5OOhFJ4GDwMB0GPks9ZIixbKlteGVk3+XBJ+H0LqUOdpaeykABWKJmd/OeLy3ER4AMbx38LLOqNxlalWuHseHgECP2WayYXj06VEJRwqXKx5VxFhlRh4fNh1K5kXAMpz782a0+7qBcq7D7OQ+5lhtuEvJIaeCVw82z0=;4:O0KfZTHm8+yLz20FN2Ywj1MNdkeob7YQrbA4VFbnt5NXgTXU253byJLKMqQ/uEr+W1sQfQUQ3eJyMzpOBOEO2f9yB5R1m3hby6MruQKbk+I5G2wbfoEbvUQyQcm1vNyUYagT4z9IkZxTCSZiAItVnbxYSjVYrnaPjkg81oQKt25SBE9Y4kipaauUvTKp5r5/Y/e9HUk3/O6Oph8BBri04s3+AIxgqJo7ncTpOmXMqUvaD3moNOLf0MkgG3h74pphlfLZV0xLkLYlOB9SZPcGm1jGk3bODFLp5M5op/+Mz7GO7IZ9tqTiYmL5GJaRUbXQ+WyxYDt0UNK2FrPVZ4sP08vEsEkTYDVXH9EuTOBfa7LOxvfP6d+SEIUdH45EdeUUksLoQCfTvFaLQgi7XUjQXXo2Sek+s5LkUJPaJDYOFgDac1wj6fqHV9xbmjX5WU/V X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001);SRVR:BY1PR0301MB1304;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1304; X-Forefront-PRVS: 0787459938 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR0301MB1304;23:a4O8fqV8JrdP1YBtNfjELTIghSPWUTxdskInGcN?= =?us-ascii?Q?k1RMUO37KKHsPQgcB3tksSLSVSOfRNEdtEk95yfzGeukz22ZnKigBasTIkB1?= =?us-ascii?Q?EDKhnUVE69lEgKg8ndPGvsgpYQt15LDdOn15HDLLToyLU8Qq+YR/MOk6e8GJ?= =?us-ascii?Q?KxEw2iFoDx6S4UpIZ2bhZqqY+eUhati6TE4rsGLlIX4VnTRAcIXIW76Rjs39?= =?us-ascii?Q?29/kq26jovkxI6qxWMTfJV1ii602Fdh4gL3dOoLvWpplB6yJU5qyd+XsSiBE?= =?us-ascii?Q?U6EtZLXD2iEk1ibav7WUZ3IMWtPhQaw0dEs0Go57NKkl/sUV0pQkecxqobCQ?= =?us-ascii?Q?xWalFozvUeAL2iYKrgC7iw5aRSo9olAifWYHHJ66EtJUrz7wYUQ+bQWD7s81?= =?us-ascii?Q?q44BN8LXUx8LTjpPrfypDXJpexT2aS4HOjCM3NTaMnReW1mQoJ41WApQC0eI?= =?us-ascii?Q?YgenGexrcwxJcVe9bn7C5XZ4Mec9Drb1gSMfR5tGVuMlQ5QdhvrK0Dtfdhoz?= =?us-ascii?Q?DJgCKWc4EfrwQLHei90zX740r7bY9aab1RKcwPvZf5qPIwowNuDBL1vUGTk9?= =?us-ascii?Q?st+4N3OvcfHWXU5l3lvyfT/7dNd3rV8AowvQctUpbj+GZq+4mgvJdldUtIGY?= =?us-ascii?Q?7TrwY3UNRs5GaCkHizDbX3ijhokj4An+6xCri9G356wtzjXYj3w1hLO4AiEA?= =?us-ascii?Q?fuXPMsdK3VB8JXe2Wl7xMLMcqXcwsRZZcEDxayPsTceSebiirWZwxTKwycd4?= =?us-ascii?Q?Tzi5zW2PjWpr/MylfqTETqno7XKqJkRJexwiVZWFW4dwCvBYYUQqTXb/rMew?= =?us-ascii?Q?aUjFro/AioSMPoEJbbMgvB6HBnhSZkrL0spRMul2Sr5xk7ZHOkIUSRxEq4LH?= =?us-ascii?Q?lF9bToZOQJ1OtJ+roNhM+0hPfMbe/yzchbmRb+5kcuds5BxB5ZKv6i4Rgy+D?= =?us-ascii?Q?RtpTgSrjLg8pqNC0X++/XLGPqumC3XlcFTb5kMWFfTO6mtzAFePunf+EGcP6?= =?us-ascii?Q?CN5u4wRRnW36jr3GR+jShOXo3cP5pAhLdC5oUIHn2TDmHxg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1304;5:a8NOfeXe39Fxxa59fSjooC2SIG0JratHasT5RVM/KfKzp5veH5cnDGWCgyV38L6tib7YTM9/LBoMr152V5EXLDl7VdfWpj451F6LyZwCOGXsWk6syQPdyQaAWbl6ArzlZ7hHufxEoh10sJ4E4L2mNA==;24:Tv0N6GZm34hcAt88iwgiJsLO/+PW0+BninxT1Ue8BM206eBJvWABuISg0duv4AiKrrCWvlvMe5ZyE5HHuNGHFpFMHQy+br/Bom6T9ks/IQE= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2015 18:27:12.7970 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB1304 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Destroy mc_io in error path in dprc_probe() only if the mc_io was created in this function. Signed-off-by: J. German Rivera --- CHANGE HISTORY Changes in v4: none Changes in v3: none Changes in v2: - Addressed comment from Dan Carpenter: * Renamed goto error labels to indicate what the goto does drivers/staging/fsl-mc/bus/dprc-driver.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 38fc404..42b2494 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -401,6 +401,7 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) size_t region_size; struct device *parent_dev = mc_dev->dev.parent; struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev); + bool mc_io_created = false; bool msi_domain_set = false; if (WARN_ON(strcmp(mc_dev->obj_desc.type, "dprc") != 0)) @@ -413,6 +414,9 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) /* * This is a child DPRC: */ + if (WARN_ON(parent_dev->bus != &fsl_mc_bus_type)) + return -EINVAL; + if (WARN_ON(mc_dev->obj_desc.region_count == 0)) return -EINVAL; @@ -427,6 +431,9 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) &mc_dev->mc_io); if (error < 0) return error; + + mc_io_created = true; + /* * Inherit parent MSI domain: */ @@ -457,7 +464,7 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) &mc_dev->mc_handle); if (error < 0) { dev_err(&mc_dev->dev, "dprc_open() failed: %d\n", error); - goto error_cleanup_mc_io; + goto error_cleanup_msi_domain; } mutex_init(&mc_bus->scan_mutex); @@ -475,11 +482,15 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) error_cleanup_open: (void)dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle); -error_cleanup_mc_io: +error_cleanup_msi_domain: if (msi_domain_set) dev_set_msi_domain(&mc_dev->dev, NULL); - fsl_destroy_mc_io(mc_dev->mc_io); + if (mc_io_created) { + fsl_destroy_mc_io(mc_dev->mc_io); + mc_dev->mc_io = NULL; + } + return error; } -- 2.3.3