From patchwork Wed Jun 15 15:01:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 636085 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rVKjd21trz9t0T for ; Thu, 16 Jun 2016 07:42:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=fvlD3pun; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rVKjd0yp8zDqlq for ; Thu, 16 Jun 2016 07:42:13 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=fvlD3pun; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-lb0-x243.google.com (mail-lb0-x243.google.com [IPv6:2a00:1450:4010:c04::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rV8r40pYvzDqjl for ; Thu, 16 Jun 2016 01:02:12 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=fvlD3pun; dkim-atps=neutral Received: by mail-lb0-x243.google.com with SMTP id td3so460514lbb.2 for ; Wed, 15 Jun 2016 08:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=o945a/eUmsSVkpxhNMHi93vN0fOFxuaGctnuEGBVSQM=; b=fvlD3puns29Lvakr4gN0XOpwK03MUo5lgaMtTQMqJtMqxWqnokdKIsg7c+8CVPVvJA 2RSpmrQbDlf2ecIwdFqM061dQlBgXZGbRl870pdfsxmVADZ/2dM++hgS5IdJkVcZOOmI I2YpyFiq2sKnJqiPtwVImlCjs4KmAqTiKv0Hh0NswDpLIycTPgROAgWpOfRuUIRCaZb6 /dYFbqsJcuYSKiCJKs8EnWi5BsJ+RCqruS8zZ/7GcfZhKIfNDlVm5iYxbDOGb5uRj7Ol 2O8/VVKI2jkV37/oUeh0VovILOIwuqZ6NP2+d8S1KWV+piYx7UiuMdZlh3rmqTpPEzD/ A5AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=o945a/eUmsSVkpxhNMHi93vN0fOFxuaGctnuEGBVSQM=; b=d2wO5FX0/KE3H7N9xjL/SvYzxQvAw922oV6fVAs+Q5uh+9KZ1XmFKGue4T18qvkwKT mujrAsOs/9yLKsuyaEUpQjyP31KBQt6QKbogMDmCCJdRXXv6mZcoM3q7f57WFHEvHu1j XHI23Pt5YglzWbe+PssfR7hX+bcH3oNQCxkby8wN+I9nzkAa0xL6fVg2h51E2EdFKhzJ QLLEJY+Hl8V3xCYihiPlPRR+4NMa5GbyOvuiUhfmmw11Ygv13nevqw+sPSY80niEnxCk 0W5NpIgb5tO4j/liYNc+RsuuyzxK/i7ryVlFmSjFfXvdKTIGI6BblbBb/OBiTYwnj/+1 +n/g== X-Gm-Message-State: ALyK8tJh+1XuVcd0Jjv8NzblmdxMTreE5rh4rR94acb2kBiXPidK1AerQd1U0K9Z5WAM2g== X-Received: by 10.28.207.136 with SMTP id f130mr12186902wmg.29.1466002926475; Wed, 15 Jun 2016 08:02:06 -0700 (PDT) Received: from maester.malat.net (bru31-1-78-225-226-121.fbx.proxad.net. [78.225.226.121]) by smtp.gmail.com with ESMTPSA id kp9sm38829060wjb.28.2016.06.15.08.02.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 08:02:05 -0700 (PDT) Received: by maester.malat.net (Postfix, from userid 1000) id 9B94F1376035; Wed, 15 Jun 2016 17:02:04 +0200 (CEST) From: Mathieu Malaterre To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] Remove a tiny memory leak in drivers/of Date: Wed, 15 Jun 2016 17:01:59 +0200 Message-Id: <1466002919-535-1-git-send-email-mathieu.malaterre@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Thu, 16 Jun 2016 07:40:55 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Mathieu Malaterre , robh+dt@kernel.org, frowand.list@gmail.com MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" On my PowerMac device-tree would generate a duplicate name: [ 0.023043] device-tree: Duplicate name in PowerPC,G4@0, renamed to "l2-cache#1" in this case a newly allocated name is generated by `safe_name`. However in this case it is never deallocated. The bug was found using kmemleak reported as: unreferenced object 0xdf532e60 (size 32): comm "swapper", pid 1, jiffies 4294892300 (age 1993.532s) hex dump (first 32 bytes): 6c 32 2d 63 61 63 68 65 23 31 00 dd e4 dd 1e c2 l2-cache#1...... ec d4 ba ce 04 ec cc de 8e 85 e9 ca c4 ec cc 9e ................ backtrace: [] kvasprintf+0x64/0xc8 [] kasprintf+0x4c/0x5c [] safe_name.isra.1+0x80/0xc4 [] __of_attach_node_sysfs+0x6c/0x11c [] of_core_init+0x8c/0xf8 [] kernel_init_freeable+0xd4/0x208 [] kernel_init+0x24/0x11c [] ret_from_kernel_thread+0x5c/0x64 Link: https://bugzilla.kernel.org/show_bug.cgi?id=120331 Signed-off-by: Mathieu Malaterre --- drivers/of/base.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index ebf84e3..3cb11df 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -174,11 +174,15 @@ int __of_attach_node_sysfs(struct device_node *np) rc = kobject_add(&np->kobj, NULL, "%s", safe_name(&of_kset->kobj, "base")); } else { - name = safe_name(&np->parent->kobj, kbasename(np->full_name)); + const char *orig_name = kbasename(np->full_name); + + name = safe_name(&np->parent->kobj, orig_name); if (!name || !name[0]) return -EINVAL; rc = kobject_add(&np->kobj, &np->parent->kobj, "%s", name); + if (name != orig_name) + kfree(name); } if (rc) return rc;