From patchwork Thu Jan 10 09:37:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Ramirez Luna X-Patchwork-Id: 1959191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3EA12DF264 for ; Thu, 10 Jan 2013 09:37:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750977Ab3AJJhY (ORCPT ); Thu, 10 Jan 2013 04:37:24 -0500 Received: from mail-oa0-f43.google.com ([209.85.219.43]:40669 "EHLO mail-oa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634Ab3AJJhW (ORCPT ); Thu, 10 Jan 2013 04:37:22 -0500 Received: by mail-oa0-f43.google.com with SMTP id k1so339160oag.2 for ; Thu, 10 Jan 2013 01:37:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=N2mPe8kzoMUGu44172SWl/VGK8ZbjsD9JiSQH+EHc0o=; b=PGSXfOhLeNxq2nDky/55oJBzzWSHPXQ6EuIbBawNfKjaYSOPWF6rsPSh1M6aWDtOWt YkPSFjJqrtng/LvvkKCR6jO2CL0lmUqlU41547fVKDtpVHx4IrnPRroyhY/e7MShrJnl 8EkyeE/7cgwBiGhiTHHO2STo9KSILoHSBvQpSXCVXjcRvUxOwwqWQmG69S2UJ2aAKDy8 cNSNufuu/DsGSDd29UWhw+oiYHUDBCn3boWkDwFr5GdB62LM7hglkIp6gL8Vek9dDKz1 lJzgBUUTdFwBny0SB1YwtD/nPal3XAs6Dq0AN6pUEkCEABGAEAM3ndr4MXB/nhIjcXNU 27Rw== X-Received: by 10.182.131.68 with SMTP id ok4mr4164973obb.58.1357810641613; Thu, 10 Jan 2013 01:37:21 -0800 (PST) Received: from localhost.localdomain (cpe-76-185-160-228.tx.res.rr.com. [76.185.160.228]) by mx.google.com with ESMTPS id ag15sm826005oec.11.2013.01.10.01.37.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Jan 2013 01:37:21 -0800 (PST) From: Omar Ramirez Luna To: Greg Kroah-Hartman Cc: Chen Gang , devel@driverdev.osuosl.org, linux-omap@vger.kernel.org, Omar Ramirez Luna Subject: [PATCH 3/5] staging: tidspbridge: fix uninitialized variable sym_name Date: Thu, 10 Jan 2013 03:37:00 -0600 Message-Id: <1357810622-1709-4-git-send-email-omar.ramirez@copitl.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1357810622-1709-1-git-send-email-omar.ramirez@copitl.com> References: <1357810622-1709-1-git-send-email-omar.ramirez@copitl.com> X-Gm-Message-State: ALoCoQk5W/ClX09UUm1SXaA1UJwMLvwEo4tldgnZqryzNWl8zXeUVO6SC6wlwzWegybFSwy/XLCv Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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: Chen Gang Signed-off-by: Omar Ramirez Luna --- drivers/staging/tidspbridge/rmgr/nldr.c | 6 ++++-- drivers/staging/tidspbridge/rmgr/node.c | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c index 6309221..ca38050 100644 --- a/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/drivers/staging/tidspbridge/rmgr/nldr.c @@ -1802,8 +1802,6 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr, bool status1 = false; s32 i = 0; 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) { switch (nldr_node->phase) { @@ -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", __func__, sym_addr, offset_range); 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; diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 737f4a9..87dfa92 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c @@ -3012,16 +3012,16 @@ int node_find_addr(struct node_mgr *node_mgr, u32 sym_addr, struct node_object *node_obj; 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) { status = nldr_find_addr(node_obj->nldr_node_obj, sym_addr, 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; + } } return status;