From patchwork Mon Nov 18 13:28:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Whitchurch X-Patchwork-Id: 1196783 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axis.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47GqhZ40nYz9sRM for ; Tue, 19 Nov 2019 00:35:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727088AbfKRNfZ (ORCPT ); Mon, 18 Nov 2019 08:35:25 -0500 Received: from smtp2.axis.com ([195.60.68.18]:54400 "EHLO smtp2.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbfKRNfZ (ORCPT ); Mon, 18 Nov 2019 08:35:25 -0500 X-Greylist: delayed 428 seconds by postgrey-1.27 at vger.kernel.org; Mon, 18 Nov 2019 08:35:23 EST IronPort-SDR: bs9+P0Lias7qQgUZjcfe6XsQmJVbm3KCbjy1lVFY1UmOks7hXisFSoWmeXtHRep6TdDl3MQvmP uFZ+N+rPQrGnFfVzu/Xe7X1kQjvOpMUeiyy/TmSF7tLZSBByavFQKlZzDC1bzypvAraIj5SIWn Adj94MkmoFBeuIZUgq9HYzi15LrtckTobI6LD+xip87mvZSxn5UXeywbBBt02Ad8ANXSioOkdo LQ9sVcoie3ylGdyshqgc46bOujZ+s2Q3QPI3XPsD7XqwqY1LqZtPGAnYigG6HQxXSm0hmaMFuu bqQ= X-IronPort-AV: E=Sophos;i="5.68,320,1569276000"; d="scan'208";a="2543781" X-Axis-User: NO X-Axis-NonUser: YES X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com From: Vincent Whitchurch To: pantelis.antoniou@konsulko.com, frowand.list@gmail.com, robh+dt@kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Whitchurch Subject: [PATCH 1/2] of: overlay: fix properties memory leak Date: Mon, 18 Nov 2019 14:28:08 +0100 Message-Id: <20191118132809.30127-1-vincent.whitchurch@axis.com> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org No changeset entries are created for #address-cells and #size-cells properties, but the duplicated properies are never freed. This results in a memory leak which is detected by kmemleak: unreferenced object 0x85887180 (size 64): backtrace: kmem_cache_alloc_trace+0x1fb/0x1fc __of_prop_dup+0x25/0x7c add_changeset_property+0x17f/0x370 build_changeset_next_level+0x29/0x20c of_overlay_fdt_apply+0x32b/0x6b4 ... Fixes: 6f75118800acf77f8 ("of: overlay: validate overlay properties #address-cells and #size-cells") Signed-off-by: Vincent Whitchurch --- drivers/of/overlay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index c423e94baf0f..5f8869e2a8b3 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -360,7 +360,7 @@ static int add_changeset_property(struct overlay_changeset *ovcs, pr_err("WARNING: memory leak will occur if overlay removed, property: %pOF/%s\n", target->np, new_prop->name); - if (ret) { + if (ret || !check_for_non_overlay_node) { kfree(new_prop->name); kfree(new_prop->value); kfree(new_prop); From patchwork Mon Nov 18 13:28:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Whitchurch X-Patchwork-Id: 1196782 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axis.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47GqhY4MBzz9sRH for ; Tue, 19 Nov 2019 00:35:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726654AbfKRNfY (ORCPT ); Mon, 18 Nov 2019 08:35:24 -0500 Received: from smtp2.axis.com ([195.60.68.18]:54400 "EHLO smtp2.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbfKRNfY (ORCPT ); Mon, 18 Nov 2019 08:35:24 -0500 X-Greylist: delayed 428 seconds by postgrey-1.27 at vger.kernel.org; Mon, 18 Nov 2019 08:35:23 EST IronPort-SDR: 0Rkb0DNuF4Q/NWH1HFcE1NdG5P8yB4M5t3f1tixIcoFWmmoSZxm+4o5+zxlluF95mC3SySB9Ja EV/OkLxsEJEVrfiKkTjL6oxZQIyjzwo4bhpqQIbi6fiyFPm7hD95pYSmjkFNbA8RYPdKhRLoKM u1yTo8ThpERI65msIOUZiVADldBaOWt1xYcN1tIDOn1ZoDomzGx96JW+aVUcOb5lr1gwjcv46j NjdsmLOWIExT8xRmDE4K9/+cgI7q1Z6nTpu9sSGYgMonVbKak0nxo3X0b9ry+cYHLybvHOCSjg BEE= X-IronPort-AV: E=Sophos;i="5.68,320,1569276000"; d="scan'208";a="2543774" X-Axis-User: NO X-Axis-NonUser: YES X-Virus-Scanned: Debian amavisd-new at bes.se.axis.com From: Vincent Whitchurch To: pantelis.antoniou@konsulko.com, frowand.list@gmail.com, robh+dt@kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Whitchurch Subject: [PATCH 2/2] of: overlay: fix target_path memory leak Date: Mon, 18 Nov 2019 14:28:09 +0100 Message-Id: <20191118132809.30127-2-vincent.whitchurch@axis.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191118132809.30127-1-vincent.whitchurch@axis.com> References: <20191118132809.30127-1-vincent.whitchurch@axis.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org target_path is used as a temporary buffer in dup_and_fixup_symbol_prop() and should be freed even in the success path. This was detected by kmemleak. unreferenced object 0x8598f6c0 (size 64): backtrace: __kmalloc_track_caller+0x17d/0x228 kvasprintf+0x2b/0x64 kasprintf+0x15/0x20 add_changeset_property+0x225/0x364 of_overlay_fdt_apply+0x42d/0x6b4 ... Fixes: e0a58f3e08d4b7fa ("of: overlay: remove a dependency on device node full_name") Signed-off-by: Vincent Whitchurch Reviewed-by: Frank Rowand --- drivers/of/overlay.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 5f8869e2a8b3..59455322a130 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -261,6 +261,8 @@ static struct property *dup_and_fixup_symbol_prop( of_property_set_flag(new_prop, OF_DYNAMIC); + kfree(target_path); + return new_prop; err_free_new_prop: