Commit 41fb433b authored by Julia Lawall's avatar Julia Lawall Committed by Ingo Molnar

arch/x86/kernel/kdebugfs.c: Ensure a consistent return value in error case

Typically, the return value desired for the failure of a
function with an integer return value is a negative integer.  In
these cases, the return value is sometimes a negative integer
and sometimes 0, due to a subsequent initialization of the
return variable within the loop.

A simplified version of the semantic match that finds this
problem is: (http://coccinelle.lip6.fr/)

//<smpl>
@r exists@
identifier ret;
position p;
constant C;
expression e1,e3,e4;
statement S;
@@

ret = -C
... when != ret = e3
    when any
if@p (...) S
... when any
if (\(ret != 0\|ret < 0\|ret > 0\) || ...) { ... return ...; }
... when != ret = e3
    when any
*if@p (...)
{
  ... when != ret = e4
  return ret;
}
//</smpl>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Link: http://lkml.kernel.org/r/1342284188-19176-7-git-send-email-Julia.Lawall@lip6.frSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 61b0fccd
...@@ -107,7 +107,7 @@ static int __init create_setup_data_nodes(struct dentry *parent) ...@@ -107,7 +107,7 @@ static int __init create_setup_data_nodes(struct dentry *parent)
{ {
struct setup_data_node *node; struct setup_data_node *node;
struct setup_data *data; struct setup_data *data;
int error = -ENOMEM; int error;
struct dentry *d; struct dentry *d;
struct page *pg; struct page *pg;
u64 pa_data; u64 pa_data;
...@@ -121,8 +121,10 @@ static int __init create_setup_data_nodes(struct dentry *parent) ...@@ -121,8 +121,10 @@ static int __init create_setup_data_nodes(struct dentry *parent)
while (pa_data) { while (pa_data) {
node = kmalloc(sizeof(*node), GFP_KERNEL); node = kmalloc(sizeof(*node), GFP_KERNEL);
if (!node) if (!node) {
error = -ENOMEM;
goto err_dir; goto err_dir;
}
pg = pfn_to_page((pa_data+sizeof(*data)-1) >> PAGE_SHIFT); pg = pfn_to_page((pa_data+sizeof(*data)-1) >> PAGE_SHIFT);
if (PageHighMem(pg)) { if (PageHighMem(pg)) {
......
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