projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sysctl_check.c
diff --git
a/kernel/sysctl_check.c
b/kernel/sysctl_check.c
index 10b90d8a03c48678258c6aaf3de353af7b06ed36..4e4932a7b3608ac6e32175ee87481c1ac47a3572 100644
(file)
--- a/
kernel/sysctl_check.c
+++ b/
kernel/sysctl_check.c
@@
-111,11
+111,9
@@
int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
const char *fail = NULL;
if (table->parent) {
const char *fail = NULL;
if (table->parent) {
- if (
table->procname &&
!table->parent->procname)
+ if (!table->parent->procname)
set_fail(&fail, table, "Parent without procname");
}
set_fail(&fail, table, "Parent without procname");
}
- if (!table->procname)
- set_fail(&fail, table, "No procname");
if (table->child) {
if (table->data)
set_fail(&fail, table, "Directory with data?");
if (table->child) {
if (table->data)
set_fail(&fail, table, "Directory with data?");
@@
-144,12
+142,8
@@
int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
set_fail(&fail, table, "No maxlen");
}
#ifdef CONFIG_PROC_SYSCTL
set_fail(&fail, table, "No maxlen");
}
#ifdef CONFIG_PROC_SYSCTL
- if (
table->procname &&
!table->proc_handler)
+ if (!table->proc_handler)
set_fail(&fail, table, "No proc_handler");
set_fail(&fail, table, "No proc_handler");
-#endif
-#if 0
- if (!table->procname && table->proc_handler)
- set_fail(&fail, table, "proc_handler without procname");
#endif
sysctl_check_leaf(namespaces, table, &fail);
}
#endif
sysctl_check_leaf(namespaces, table, &fail);
}