From patchwork Wed Apr 22 09:55:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227192 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B989DC55186 for ; Wed, 22 Apr 2020 10:36:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 913DA2073A for ; Wed, 22 Apr 2020 10:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551790; bh=3qoeRi4jVEPlzt/TTSwzZyBPmdQFr/1xlCHSDNBu8P0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VSRzXFXxMJjN1z+LRVwk1ZSgwqu850qjfE4EZPLTr844i4TD5uQupVLi94sRid7Je Kolib1WWnYI9owfi1BmEPBm506KLhaHL4pvVOCmzMj9uMAX1/TmRumA9q3i+4RuAWN 0YKYPzW3g5CpSuTiJpsJRc+qWM5bcCFcpDerW+gc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730250AbgDVKW4 (ORCPT ); Wed, 22 Apr 2020 06:22:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:59258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730245AbgDVKWz (ORCPT ); Wed, 22 Apr 2020 06:22:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E16582076B; Wed, 22 Apr 2020 10:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550975; bh=3qoeRi4jVEPlzt/TTSwzZyBPmdQFr/1xlCHSDNBu8P0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Avmt52cESx+2O8yJ8ZFb5STCnVard5CBDQ9u6+CfSQJwD8n2AEmP2ZReRD7mpKAsV 834zrOgQ2oUNkUX9rqreW18B1e6I8oy8sHVoycWW5krBXxWfYp+8j1LnV1lSuDE95o gCHEeQ3DPHR0jgy+kZK6rrv3lcBbj23yy4bd+Apw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Erhard F." , Frank Rowand , Rob Herring Subject: [PATCH 5.6 023/166] of: unittest: kmemleak in of_unittest_overlay_high_level() Date: Wed, 22 Apr 2020 11:55:50 +0200 Message-Id: <20200422095051.037379809@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095047.669225321@linuxfoundation.org> References: <20200422095047.669225321@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Frank Rowand commit 145fc138f9aae4f9e1331352e301df28e16aed35 upstream. kmemleak reports several memory leaks from devicetree unittest. This is the fix for problem 3 of 5. of_unittest_overlay_high_level() failed to kfree the newly created property when the property named 'name' is skipped. Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT") Reported-by: Erhard F. Signed-off-by: Frank Rowand Signed-off-by: Rob Herring Signed-off-by: Greg Kroah-Hartman --- drivers/of/unittest.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -2571,8 +2571,11 @@ static __init void of_unittest_overlay_h goto err_unlock; } if (__of_add_property(of_symbols, new_prop)) { + kfree(new_prop->name); + kfree(new_prop->value); + kfree(new_prop); /* "name" auto-generated by unflatten */ - if (!strcmp(new_prop->name, "name")) + if (!strcmp(prop->name, "name")) continue; unittest(0, "duplicate property '%s' in overlay_base node __symbols__", prop->name);