From patchwork Wed Nov 29 19:17:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 842700 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yn9Kq712Tz9s74 for ; Thu, 30 Nov 2017 06:18:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752211AbdK2TRx (ORCPT ); Wed, 29 Nov 2017 14:17:53 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:54176 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751675AbdK2TRw (ORCPT ); Wed, 29 Nov 2017 14:17:52 -0500 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1eK7ri-0006qt-IB; Wed, 29 Nov 2017 19:17:50 +0000 From: Colin King To: Pantelis Antoniou , Rob Herring , Frank Rowand , devicetree@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] of: overlay: fix memory leak of ovcs on error exit path Date: Wed, 29 Nov 2017 19:17:50 +0000 Message-Id: <20171129191750.25254-1-colin.king@canonical.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Colin Ian King Currently if the call to of_resolve_phandles fails then then ovcs is not kfree'd on the error exit path. Rather than try and make the clean up exit path more convoluted, fix this by just kfree'ing ovcs at the point of error detection and exit via the same exit path. Detected by CoverityScan, CID#1462296 ("Resource Leak") Fixes: f948d6d8b792 ("of: overlay: avoid race condition between applying multiple overlays") Signed-off-by: Colin Ian King --- drivers/of/overlay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 53bc9e3f0b98..6c8efe7d8cbb 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -708,8 +708,10 @@ int of_overlay_apply(struct device_node *tree, int *ovcs_id) of_overlay_mutex_lock(); ret = of_resolve_phandles(tree); - if (ret) + if (ret) { + kfree(ovcs); goto err_overlay_unlock; + } mutex_lock(&of_mutex);