d9fc880723
Fix a memory leak resulting from memory allocation in safe_name().
This patch fixes all call sites of safe_name().
Mathieu Malaterre reported the memory leak on boot:
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:
[<c02d3350>] kvasprintf+0x64/0xc8
[<c02d3400>] kasprintf+0x4c/0x5c
[<c0453814>] safe_name.isra.1+0x80/0xc4
[<c04545d8>] __of_attach_node_sysfs+0x6c/0x11c
[<c075f21c>] of_core_init+0x8c/0xf8
[<c0729594>] kernel_init_freeable+0xd4/0x208
[<c00047e8>] kernel_init+0x24/0x11c
[<c00158ec>] ret_from_kernel_thread+0x5c/0x64
Link: https://bugzilla.kernel.org/show_bug.cgi?id=120331
Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
Reported-by: mathieu.malaterre@gmail.com
Tested-by: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
99 lines
3.4 KiB
C
99 lines
3.4 KiB
C
#ifndef _LINUX_OF_PRIVATE_H
|
|
#define _LINUX_OF_PRIVATE_H
|
|
/*
|
|
* Private symbols used by OF support code
|
|
*
|
|
* Paul Mackerras August 1996.
|
|
* Copyright (C) 1996-2005 Paul Mackerras.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
/**
|
|
* struct alias_prop - Alias property in 'aliases' node
|
|
* @link: List node to link the structure in aliases_lookup list
|
|
* @alias: Alias property name
|
|
* @np: Pointer to device_node that the alias stands for
|
|
* @id: Index value from end of alias name
|
|
* @stem: Alias string without the index
|
|
*
|
|
* The structure represents one alias property of 'aliases' node as
|
|
* an entry in aliases_lookup list.
|
|
*/
|
|
struct alias_prop {
|
|
struct list_head link;
|
|
const char *alias;
|
|
struct device_node *np;
|
|
int id;
|
|
char stem[0];
|
|
};
|
|
|
|
extern struct mutex of_mutex;
|
|
extern struct list_head aliases_lookup;
|
|
extern struct kset *of_kset;
|
|
|
|
|
|
static inline struct device_node *kobj_to_device_node(struct kobject *kobj)
|
|
{
|
|
return container_of(kobj, struct device_node, kobj);
|
|
}
|
|
|
|
#if defined(CONFIG_OF_DYNAMIC)
|
|
extern int of_property_notify(int action, struct device_node *np,
|
|
struct property *prop, struct property *old_prop);
|
|
extern void of_node_release(struct kobject *kobj);
|
|
extern int __of_changeset_apply(struct of_changeset *ocs);
|
|
extern int __of_changeset_revert(struct of_changeset *ocs);
|
|
#else /* CONFIG_OF_DYNAMIC */
|
|
static inline int of_property_notify(int action, struct device_node *np,
|
|
struct property *prop, struct property *old_prop)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_OF_DYNAMIC */
|
|
|
|
/**
|
|
* General utilities for working with live trees.
|
|
*
|
|
* All functions with two leading underscores operate
|
|
* without taking node references, so you either have to
|
|
* own the devtree lock or work on detached trees only.
|
|
*/
|
|
struct property *__of_prop_dup(const struct property *prop, gfp_t allocflags);
|
|
__printf(2, 3) struct device_node *__of_node_dup(const struct device_node *np, const char *fmt, ...);
|
|
|
|
extern const void *__of_get_property(const struct device_node *np,
|
|
const char *name, int *lenp);
|
|
extern int __of_add_property(struct device_node *np, struct property *prop);
|
|
extern int __of_add_property_sysfs(struct device_node *np,
|
|
struct property *prop);
|
|
extern int __of_remove_property(struct device_node *np, struct property *prop);
|
|
extern void __of_remove_property_sysfs(struct device_node *np,
|
|
struct property *prop);
|
|
extern int __of_update_property(struct device_node *np,
|
|
struct property *newprop, struct property **oldprop);
|
|
extern void __of_update_property_sysfs(struct device_node *np,
|
|
struct property *newprop, struct property *oldprop);
|
|
|
|
extern void __of_attach_node(struct device_node *np);
|
|
extern int __of_attach_node_sysfs(struct device_node *np);
|
|
extern void __of_detach_node(struct device_node *np);
|
|
extern void __of_detach_node_sysfs(struct device_node *np);
|
|
|
|
extern void __of_sysfs_remove_bin_file(struct device_node *np,
|
|
struct property *prop);
|
|
|
|
/* iterators for transactions, used for overlays */
|
|
/* forward iterator */
|
|
#define for_each_transaction_entry(_oft, _te) \
|
|
list_for_each_entry(_te, &(_oft)->te_list, node)
|
|
|
|
/* reverse iterator */
|
|
#define for_each_transaction_entry_reverse(_oft, _te) \
|
|
list_for_each_entry_reverse(_te, &(_oft)->te_list, node)
|
|
|
|
#endif /* _LINUX_OF_PRIVATE_H */
|