lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: Use IS_ERR_OR_NULL().

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明
2013-01-22 06:33:09 +00:00
committed by David S. Miller
parent 3f0d2ba0bd
commit 0cc8d8df9b
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/netfilter/arp_tables.c
View File

@@ -901,7 +901,7 @@ static int get_info(struct net *net, void __user *user,
#endif #endif
t = try_then_request_module(xt_find_table_lock(net, NFPROTO_ARP, name), t = try_then_request_module(xt_find_table_lock(net, NFPROTO_ARP, name),
"arptable_%s", name); "arptable_%s", name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
struct arpt_getinfo info; struct arpt_getinfo info;
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
@@ -958,7 +958,7 @@ static int get_entries(struct net *net, struct arpt_get_entries __user *uptr,
} }
t = xt_find_table_lock(net, NFPROTO_ARP, get.name); t = xt_find_table_lock(net, NFPROTO_ARP, get.name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
duprintf("t->private->number = %u\n", duprintf("t->private->number = %u\n",
@@ -1001,7 +1001,7 @@ static int __do_replace(struct net *net, const char *name,
t = try_then_request_module(xt_find_table_lock(net, NFPROTO_ARP, name), t = try_then_request_module(xt_find_table_lock(net, NFPROTO_ARP, name),
"arptable_%s", name); "arptable_%s", name);
if (!t || IS_ERR(t)) { if (IS_ERR_OR_NULL(t)) {
ret = t ? PTR_ERR(t) : -ENOENT; ret = t ? PTR_ERR(t) : -ENOENT;
goto free_newinfo_counters_untrans; goto free_newinfo_counters_untrans;
} }
@@ -1158,7 +1158,7 @@ static int do_add_counters(struct net *net, const void __user *user,
} }
t = xt_find_table_lock(net, NFPROTO_ARP, name); t = xt_find_table_lock(net, NFPROTO_ARP, name);
if (!t || IS_ERR(t)) { if (IS_ERR_OR_NULL(t)) {
ret = t ? PTR_ERR(t) : -ENOENT; ret = t ? PTR_ERR(t) : -ENOENT;
goto free; goto free;
} }
@@ -1646,7 +1646,7 @@ static int compat_get_entries(struct net *net,
xt_compat_lock(NFPROTO_ARP); xt_compat_lock(NFPROTO_ARP);
t = xt_find_table_lock(net, NFPROTO_ARP, get.name); t = xt_find_table_lock(net, NFPROTO_ARP, get.name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
struct xt_table_info info; struct xt_table_info info;

10
net/ipv4/netfilter/ip_tables.c
View File

@@ -1090,7 +1090,7 @@ static int get_info(struct net *net, void __user *user,
#endif #endif
t = try_then_request_module(xt_find_table_lock(net, AF_INET, name), t = try_then_request_module(xt_find_table_lock(net, AF_INET, name),
"iptable_%s", name); "iptable_%s", name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
struct ipt_getinfo info; struct ipt_getinfo info;
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
@@ -1149,7 +1149,7 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
} }
t = xt_find_table_lock(net, AF_INET, get.name); t = xt_find_table_lock(net, AF_INET, get.name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
duprintf("t->private->number = %u\n", private->number); duprintf("t->private->number = %u\n", private->number);
if (get.size == private->size) if (get.size == private->size)
@@ -1189,7 +1189,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
t = try_then_request_module(xt_find_table_lock(net, AF_INET, name), t = try_then_request_module(xt_find_table_lock(net, AF_INET, name),
"iptable_%s", name); "iptable_%s", name);
if (!t || IS_ERR(t)) { if (IS_ERR_OR_NULL(t)) {
ret = t ? PTR_ERR(t) : -ENOENT; ret = t ? PTR_ERR(t) : -ENOENT;
goto free_newinfo_counters_untrans; goto free_newinfo_counters_untrans;
} }
@@ -1347,7 +1347,7 @@ do_add_counters(struct net *net, const void __user *user,
} }
t = xt_find_table_lock(net, AF_INET, name); t = xt_find_table_lock(net, AF_INET, name);
if (!t || IS_ERR(t)) { if (IS_ERR_OR_NULL(t)) {
ret = t ? PTR_ERR(t) : -ENOENT; ret = t ? PTR_ERR(t) : -ENOENT;
goto free; goto free;
} }
@@ -1931,7 +1931,7 @@ compat_get_entries(struct net *net, struct compat_ipt_get_entries __user *uptr,
xt_compat_lock(AF_INET); xt_compat_lock(AF_INET);
t = xt_find_table_lock(net, AF_INET, get.name); t = xt_find_table_lock(net, AF_INET, get.name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
struct xt_table_info info; struct xt_table_info info;
duprintf("t->private->number = %u\n", private->number); duprintf("t->private->number = %u\n", private->number);

10
net/ipv6/netfilter/ip6_tables.c
View File

@@ -1098,7 +1098,7 @@ static int get_info(struct net *net, void __user *user,
#endif #endif
t = try_then_request_module(xt_find_table_lock(net, AF_INET6, name), t = try_then_request_module(xt_find_table_lock(net, AF_INET6, name),
"ip6table_%s", name); "ip6table_%s", name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
struct ip6t_getinfo info; struct ip6t_getinfo info;
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
@@ -1157,7 +1157,7 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
} }
t = xt_find_table_lock(net, AF_INET6, get.name); t = xt_find_table_lock(net, AF_INET6, get.name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
struct xt_table_info *private = t->private; struct xt_table_info *private = t->private;
duprintf("t->private->number = %u\n", private->number); duprintf("t->private->number = %u\n", private->number);
if (get.size == private->size) if (get.size == private->size)
@@ -1197,7 +1197,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
t = try_then_request_module(xt_find_table_lock(net, AF_INET6, name), t = try_then_request_module(xt_find_table_lock(net, AF_INET6, name),
"ip6table_%s", name); "ip6table_%s", name);
if (!t || IS_ERR(t)) { if (IS_ERR_OR_NULL(t)) {
ret = t ? PTR_ERR(t) : -ENOENT; ret = t ? PTR_ERR(t) : -ENOENT;
goto free_newinfo_counters_untrans; goto free_newinfo_counters_untrans;
} }
@@ -1355,7 +1355,7 @@ do_add_counters(struct net *net, const void __user *user, unsigned int len,
} }
t = xt_find_table_lock(net, AF_INET6, name); t = xt_find_table_lock(net, AF_INET6, name);
if (!t || IS_ERR(t)) { if (IS_ERR_OR_NULL(t)) {
ret = t ? PTR_ERR(t) : -ENOENT; ret = t ? PTR_ERR(t) : -ENOENT;
goto free; goto free;
} }
@@ -1939,7 +1939,7 @@ compat_get_entries(struct net *net, struct compat_ip6t_get_entries __user *uptr,
xt_compat_lock(AF_INET6); xt_compat_lock(AF_INET6);
t = xt_find_table_lock(net, AF_INET6, get.name); t = xt_find_table_lock(net, AF_INET6, get.name);
if (t && !IS_ERR(t)) { if (!IS_ERR_OR_NULL(t)) {
const struct xt_table_info *private = t->private; const struct xt_table_info *private = t->private;
struct xt_table_info info; struct xt_table_info info;
duprintf("t->private->number = %u\n", private->number); duprintf("t->private->number = %u\n", private->number);