Commit 49720e01 authored by Omar Ramirez Luna's avatar Omar Ramirez Luna Committed by Greg Kroah-Hartman

staging: tidspbridge: fix uninitialized variable sym_name

On both counts, sym_name could be printed uninitialized, this
is solved by moving the pr_* statement to be triggered if the
value is assigned.
Reported-by: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarOmar Ramirez Luna <omar.ramirez@copitl.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94c947cd
...@@ -1802,8 +1802,6 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr, ...@@ -1802,8 +1802,6 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr,
bool status1 = false; bool status1 = false;
s32 i = 0; s32 i = 0;
struct lib_node root = { NULL, 0, NULL }; struct lib_node root = { NULL, 0, NULL };
pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__, (u32) nldr_node,
sym_addr, offset_range, (u32) offset_output, sym_name);
if (nldr_node->dynamic && *nldr_node->phase_split) { if (nldr_node->dynamic && *nldr_node->phase_split) {
switch (nldr_node->phase) { switch (nldr_node->phase) {
...@@ -1852,6 +1850,10 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr, ...@@ -1852,6 +1850,10 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr,
pr_debug("%s: Address 0x%x not found in range %d.\n", pr_debug("%s: Address 0x%x not found in range %d.\n",
__func__, sym_addr, offset_range); __func__, sym_addr, offset_range);
status = -ESPIPE; status = -ESPIPE;
} else {
pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n",
__func__, (u32) nldr_node, sym_addr, offset_range,
(u32) offset_output, sym_name);
} }
return status; return status;
......
...@@ -3012,16 +3012,16 @@ int node_find_addr(struct node_mgr *node_mgr, u32 sym_addr, ...@@ -3012,16 +3012,16 @@ int node_find_addr(struct node_mgr *node_mgr, u32 sym_addr,
struct node_object *node_obj; struct node_object *node_obj;
int status = -ENOENT; int status = -ENOENT;
pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__,
(unsigned int) node_mgr,
sym_addr, offset_range,
(unsigned int) sym_addr_output, sym_name);
list_for_each_entry(node_obj, &node_mgr->node_list, list_elem) { list_for_each_entry(node_obj, &node_mgr->node_list, list_elem) {
status = nldr_find_addr(node_obj->nldr_node_obj, sym_addr, status = nldr_find_addr(node_obj->nldr_node_obj, sym_addr,
offset_range, sym_addr_output, sym_name); offset_range, sym_addr_output, sym_name);
if (!status) if (!status) {
pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__,
(unsigned int) node_mgr,
sym_addr, offset_range,
(unsigned int) sym_addr_output, sym_name);
break; break;
}
} }
return status; return status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment