浏览代码

kernel/sysctl.c: code cleanups

Remove unnecessary else block, remove redundant return and call to kfree
in if block.

Link: http://lkml.kernel.org/r/1510238435-1655-1-git-send-email-mail@okal.no
Signed-off-by: Ola N. Kaldestad <mail@okal.no>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Ola N. Kaldestad 7 年之前
父节点
当前提交
f9eb2fdd04
共有 1 个文件被更改,包括 3 次插入5 次删除
  1. 3 5
      kernel/sysctl.c

+ 3 - 5
kernel/sysctl.c

@@ -3127,14 +3127,12 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
 			else
 			else
 				bitmap_copy(bitmap, tmp_bitmap, bitmap_len);
 				bitmap_copy(bitmap, tmp_bitmap, bitmap_len);
 		}
 		}
-		kfree(tmp_bitmap);
 		*lenp -= left;
 		*lenp -= left;
 		*ppos += *lenp;
 		*ppos += *lenp;
-		return 0;
-	} else {
-		kfree(tmp_bitmap);
-		return err;
 	}
 	}
+
+	kfree(tmp_bitmap);
+	return err;
 }
 }
 
 
 #else /* CONFIG_PROC_SYSCTL */
 #else /* CONFIG_PROC_SYSCTL */