public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Arnd Bergmann <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org,
	arnd@arndb.de, daniel.lezcano@linaro.org, tglx@linutronix.de
Subject: [tip:timers/core] clocksource/drivers: Fix uninitialized variable use in timer_of_init
Date: Wed, 21 Jun 2017 15:06:55 -0700	[thread overview]
Message-ID: <tip-b7dcc4eacc45263ac5d3a0bd78c64e9ff7c94c13@git.kernel.org> (raw)
In-Reply-To: <20170621215005.3870011-1-arnd@arndb.de>

Commit-ID:  b7dcc4eacc45263ac5d3a0bd78c64e9ff7c94c13
Gitweb:     http://git.kernel.org/tip/b7dcc4eacc45263ac5d3a0bd78c64e9ff7c94c13
Author:     Arnd Bergmann <arnd@arndb.de>
AuthorDate: Wed, 21 Jun 2017 23:49:54 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 22 Jun 2017 00:04:26 +0200

clocksource/drivers: Fix uninitialized variable use in timer_of_init

If none of the flags are set, 'ret' is uninitialized as pointed out
by gcc:

drivers/clocksource/timer-of.c: In function 'timer_of_init':
drivers/clocksource/timer-of.c:160:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Since calling the function without any of the flags is an error,
set the return value to -EINVAL for that case.

[ tglx: Get rid of the silly backwards goto while at it ]

Fixes: dc11bae78529 ("clocksource/drivers: Add timer-of common init routine")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: http://lkml.kernel.org/r/20170621215005.3870011-1-arnd@arndb.de

---
 drivers/clocksource/timer-of.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index be1dbee..64b1c20 100644
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -130,7 +130,7 @@ static __init int timer_base_init(struct device_node *np,
 
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
-	int ret;
+	int ret = -EINVAL;
 	int flags = 0;
 
 	if (to->flags & TIMER_OF_BASE) {
@@ -156,7 +156,6 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
 
 	if (!to->clkevt.name)
 		to->clkevt.name = np->name;
-out:
 	return ret;
 
 out_fail:
@@ -168,5 +167,5 @@ out_fail:
 
 	if (flags & TIMER_OF_BASE)
 		timer_base_exit(&to->of_base);
-	goto out;
+	return ret;
 }

  reply	other threads:[~2017-06-21 22:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-21 21:49 [PATCH] clocksource/drivers: fix uninitialized variable use in timer_of_init Arnd Bergmann
2017-06-21 22:06 ` tip-bot for Arnd Bergmann [this message]
2017-06-22  7:07 ` Daniel Lezcano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-b7dcc4eacc45263ac5d3a0bd78c64e9ff7c94c13@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=arnd@arndb.de \
    --cc=daniel.lezcano@linaro.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox