Re: [PATCH 2/4] cpupower: Remove redundant error check

From: Dan Carpenter
Date: Sat May 17 2014 - 17:56:44 EST


On Sat, May 17, 2014 at 11:34:46PM +0200, Peter Senna Tschudin wrote:
> On Sat, May 17, 2014 at 10:22 PM, Dan Carpenter
> <dan.carpenter@xxxxxxxxxx> wrote:
> > On Sat, May 17, 2014 at 08:22:58PM +0200, Peter Senna Tschudin wrote:
> >> diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c
> >> index a416de8..4e2f35a 100644
> >> --- a/tools/power/cpupower/utils/cpufreq-set.c
> >> +++ b/tools/power/cpupower/utils/cpufreq-set.c
> >> @@ -320,12 +320,11 @@ int cmd_freq_set(int argc, char **argv)
> >>
> >> printf(_("Setting cpu: %d\n"), cpu);
> >> ret = do_one_cpu(cpu, &new_pol, freq, policychange);
> >> - if (ret)
> >> + if (ret) {
> >> + print_error();
> >> break;
> >
> > Just return directly instead of break return;
> >
> >> + }
> >> }
> >>
> >> - if (ret)
> >> - print_error();
> >> -
> >> return ret;
> >
> > Are you sure this patch is correct? Theoretically, it's possible to
> > reach the end of this function without going hitting the
> > "ret = do_one_cpu(...);" assignment.
> >
> > Don't be fooled by the "int ret = 0;" initialization, that is a trick
> > initialization to mislead the unwary. By the end of the do while loop
> > then "ret" is always -1.
> I have missed that, thank you for pointing this out. This patch is
> wrong and should not be applied, please ignore it.
>
> Dan, should I just leave this file as it is?

I think in reality we should always hit the "ret = do_one_cpu()"
assignment. But your static analysis tool should say that we don't know
that, so that's why I brought it up.

My guess is that the original code is bad and we should say:

ret = do_one_cpu(cpu, &new_pol, freq, policychange);
if (ret) {
print_error();
return ret;
}
}

return 0;

I am currently involved in a number of threads, not just yours, where I
am encouraging people to replace ambiguous returns with "return 0;".
This is my life now.

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/