Skip to contentSkip to conversation

netfilter: PTR_RET can be used

PATCH Applied Fengguang Wu 3 participants 5 messages Jul 29, 2012 – Aug 20, 2012

Subsystems (4)
Networking Kernel janitors netfilter Ethernet bridge
lore
Share & tools
lore

Fengguang Wu

author
#0 lore raw

PATCH 1/1 netfilter: PTR_RET can be used

This quiets the coccinelle warnings:

net/bridge/netfilter/ebtable_filter.c:107:1-3: WARNING: PTR_RET can be used net/bridge/netfilter/ebtable_nat.c:107:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_filter.c:65:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_mangle.c:100:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_raw.c:44:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_security.c:62:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_filter.c:72:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_mangle.c:107:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_raw.c:51:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_security.c:70:1-3: WARNING: PTR_RET can be used

Signed-off-by Fengguang Wu <[email protected]>
---
 net/bridge/netfilter/ebtable_filter.c  |    4 +---
 net/bridge/netfilter/ebtable_nat.c     |    4 +---
 net/ipv4/netfilter/iptable_filter.c    |    4 +---
 net/ipv4/netfilter/iptable_mangle.c    |    4 +---
 net/ipv4/netfilter/iptable_raw.c       |    4 +---
 net/ipv4/netfilter/iptable_security.c  |    5 +----
 net/ipv6/netfilter/ip6table_filter.c   |    4 +---
 net/ipv6/netfilter/ip6table_mangle.c   |    4 +---
 net/ipv6/netfilter/ip6table_raw.c      |    4 +---
 net/ipv6/netfilter/ip6table_security.c |    5 +----
 10 files changed, 10 insertions(+), 32 deletions(-)
net/bridge/netfilter/ebtable_filter.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_filter
 static int __net_init frame_filter_net_init(struct net *net)
 {
 	net->xt.frame_filter = ebt_register_table(net, &frame_filter);
-	if (IS_ERR(net->xt.frame_filter))
-		return PTR_ERR(net->xt.frame_filter);
-	return 0;
+	return PTR_RET(net->xt.frame_filter);
 }
 
 static void __net_exit frame_filter_net_exit(struct net *net)
net/bridge/netfilter/ebtable_nat.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_nat[]
 static int __net_init frame_nat_net_init(struct net *net)
 {
 	net->xt.frame_nat = ebt_register_table(net, &frame_nat);
-	if (IS_ERR(net->xt.frame_nat))
-		return PTR_ERR(net->xt.frame_nat);
-	return 0;
+	return PTR_RET(net->xt.frame_nat);
 }
 
 static void __net_exit frame_nat_net_exit(struct net *net)
net/ipv4/netfilter/iptable_filter.c +15 -33

88 lines not on this page · raw message

#1 lore raw

Am 29.07.2012 02:45, schrieb Fengguang Wu:

Quoted 30 lines

This quiets the coccinelle warnings:

net/bridge/netfilter/ebtable_filter.c:107:1-3: WARNING: PTR_RET can be used net/bridge/netfilter/ebtable_nat.c:107:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_filter.c:65:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_mangle.c:100:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_raw.c:44:1-3: WARNING: PTR_RET can be used net/ipv6/netfilter/ip6table_security.c:62:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_filter.c:72:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_mangle.c:107:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_raw.c:51:1-3: WARNING: PTR_RET can be used net/ipv4/netfilter/iptable_security.c:70:1-3: WARNING: PTR_RET can be used

Signed-off-by Fengguang Wu <[email protected]>
---
 net/bridge/netfilter/ebtable_filter.c  |    4 +---
 net/bridge/netfilter/ebtable_nat.c     |    4 +---
 net/ipv4/netfilter/iptable_filter.c    |    4 +---
 net/ipv4/netfilter/iptable_mangle.c    |    4 +---
 net/ipv4/netfilter/iptable_raw.c       |    4 +---
 net/ipv4/netfilter/iptable_security.c  |    5 +----
 net/ipv6/netfilter/ip6table_filter.c   |    4 +---
 net/ipv6/netfilter/ip6table_mangle.c   |    4 +---
 net/ipv6/netfilter/ip6table_raw.c      |    4 +---
 net/ipv6/netfilter/ip6table_security.c |    5 +----
 10 files changed, 10 insertions(+), 32 deletions(-)

net/bridge/netfilter/ebtable_filter.c static struct nf_hook_ops ebt_ops_filter · line 105

Quoted 9 lines
net/bridge/netfilter/ebtable_filter.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_filter
 static int __net_init frame_filter_net_init(struct net *net)
 {
 	net->xt.frame_filter = ebt_register_table(net, &frame_filter);
-	if (IS_ERR(net->xt.frame_filter))
-		return PTR_ERR(net->xt.frame_filter);
-	return 0;
+	return PTR_RET(net->xt.frame_filter);
 }

i do not understand this,
ebt_register_table() return (struct ebt_table *) on success

Does PTR_RET really return 0 if this is a propper pointer ?

re,
wh

Quoted 118 lines
net/bridge/netfilter/ebtable_filter.c +0 -0
 static void __net_exit frame_filter_net_exit(struct net *net)
net/bridge/netfilter/ebtable_nat.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_nat[]
 static int __net_init frame_nat_net_init(struct net *net)
 {
 	net->xt.frame_nat = ebt_register_table(net, &frame_nat);
-	if (IS_ERR(net->xt.frame_nat))
-		return PTR_ERR(net->xt.frame_nat);
-	return 0;
+	return PTR_RET(net->xt.frame_nat);
 }
 
 static void __net_exit frame_nat_net_exit(struct net *net)
net/ipv4/netfilter/iptable_filter.c +1 -3
@@ -69,9 +69,7 @@ static int __net_init iptable_filter_net
 	net->ipv4.iptable_filter >  		ipt_register_table(net, &packet_filter, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv4.iptable_filter))
-		return PTR_ERR(net->ipv4.iptable_filter);
-	return 0;
+	return PTR_RET(net->ipv4.iptable_filter);
 }
 
 static void __net_exit iptable_filter_net_exit(struct net *net)
net/ipv4/netfilter/iptable_mangle.c +1 -3
@@ -104,9 +104,7 @@ static int __net_init iptable_mangle_net
 	net->ipv4.iptable_mangle >  		ipt_register_table(net, &packet_mangler, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv4.iptable_mangle))
-		return PTR_ERR(net->ipv4.iptable_mangle);
-	return 0;
+	return PTR_RET(net->ipv4.iptable_mangle);
 }
 
 static void __net_exit iptable_mangle_net_exit(struct net *net)
net/ipv4/netfilter/iptable_raw.c +1 -3
@@ -48,9 +48,7 @@ static int __net_init iptable_raw_net_in
 	net->ipv4.iptable_raw >  		ipt_register_table(net, &packet_raw, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv4.iptable_raw))
-		return PTR_ERR(net->ipv4.iptable_raw);
-	return 0;
+	return PTR_RET(net->ipv4.iptable_raw);
 }
 
 static void __net_exit iptable_raw_net_exit(struct net *net)
net/ipv4/netfilter/iptable_security.c +1 -4
@@ -66,10 +66,7 @@ static int __net_init iptable_security_n
 	net->ipv4.iptable_security >  		ipt_register_table(net, &security_table, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv4.iptable_security))
-		return PTR_ERR(net->ipv4.iptable_security);
-
-	return 0;
+	return PTR_RET(net->ipv4.iptable_security);
 }
 
 static void __net_exit iptable_security_net_exit(struct net *net)
net/ipv6/netfilter/ip6table_filter.c +1 -3
@@ -61,9 +61,7 @@ static int __net_init ip6table_filter_ne
 	net->ipv6.ip6table_filter >  		ip6t_register_table(net, &packet_filter, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv6.ip6table_filter))
-		return PTR_ERR(net->ipv6.ip6table_filter);
-	return 0;
+	return PTR_RET(net->ipv6.ip6table_filter);
 }
 
 static void __net_exit ip6table_filter_net_exit(struct net *net)
net/ipv6/netfilter/ip6table_mangle.c +1 -3
@@ -97,9 +97,7 @@ static int __net_init ip6table_mangle_ne
 	net->ipv6.ip6table_mangle >  		ip6t_register_table(net, &packet_mangler, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv6.ip6table_mangle))
-		return PTR_ERR(net->ipv6.ip6table_mangle);
-	return 0;
+	return PTR_RET(net->ipv6.ip6table_mangle);
 }
 
 static void __net_exit ip6table_mangle_net_exit(struct net *net)
net/ipv6/netfilter/ip6table_raw.c +1 -3
@@ -40,9 +40,7 @@ static int __net_init ip6table_raw_net_i
 	net->ipv6.ip6table_raw >  		ip6t_register_table(net, &packet_raw, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv6.ip6table_raw))
-		return PTR_ERR(net->ipv6.ip6table_raw);
-	return 0;
+	return PTR_RET(net->ipv6.ip6table_raw);
 }
 
 static void __net_exit ip6table_raw_net_exit(struct net *net)
net/ipv6/netfilter/ip6table_security.c +1 -5
@@ -58,10 +58,7 @@ static int __net_init ip6table_security_
 	net->ipv6.ip6table_security >  		ip6t_register_table(net, &security_table, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv6.ip6table_security))
-		return PTR_ERR(net->ipv6.ip6table_security);
-
-	return 0;
+	return PTR_RET(net->ipv6.ip6table_security);
 }
 
 static void __net_exit ip6table_security_net_exit(struct net *net)
--

To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#2 lore raw
Quoted 16 lines

net/bridge/netfilter/ebtable_filter.c static struct nf_hook_ops ebt_ops_filter · line 105

Quoted 12 lines
net/bridge/netfilter/ebtable_filter.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_filter
 static int __net_init frame_filter_net_init(struct net *net)
 {
 	net->xt.frame_filter = ebt_register_table(net, &frame_filter);
-	if (IS_ERR(net->xt.frame_filter))
-		return PTR_ERR(net->xt.frame_filter);
-	return 0;
+	return PTR_RET(net->xt.frame_filter);
 }

i do not understand this,
ebt_register_table() return (struct ebt_table *) on success

Quoted 1 line

Does PTR_RET really return 0 if this is a propper pointer ?

Right. Here is how PTR_RET defined. This patch does not change any behavior.

static inline int __must_check PTR_RET(const void *ptr)

{      
        if (IS_ERR(ptr))
                return PTR_ERR(ptr);
        else   
                return 0;
}

Thanks,
Fengguang

#4 lore raw
In reply to Fengguang Wu

Am 29.07.2012 14:14, schrieb Fengguang Wu:

Quoted 20 lines
Quoted 16 lines

net/bridge/netfilter/ebtable_filter.c static struct nf_hook_ops ebt_ops_filter · line 105

Quoted 12 lines
net/bridge/netfilter/ebtable_filter.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_filter
 static int __net_init frame_filter_net_init(struct net *net)
 {
 	net->xt.frame_filter = ebt_register_table(net, &frame_filter);
-	if (IS_ERR(net->xt.frame_filter))
-		return PTR_ERR(net->xt.frame_filter);
-	return 0;
+	return PTR_RET(net->xt.frame_filter);
 }

i do not understand this,
ebt_register_table() return (struct ebt_table *) on success

Quoted 1 line

Does PTR_RET really return 0 if this is a propper pointer ?

Right. Here is how PTR_RET defined. This patch does not change any behavior.

Quoted 8 lines

static inline int __must_check PTR_RET(const void *ptr)

{      
        if (IS_ERR(ptr))
                return PTR_ERR(ptr);
        else   
                return 0;
}

ok, my brain mixed it with PTR_ERR(), leading to the question.

re,
wh

Quoted 4 lines

Thanks,
Fengguang

maintainer Applied
#3 lore raw
In reply to Fengguang Wu
Quoted 20 lines · Fengguang Wu
Quoted 16 lines

net/bridge/netfilter/ebtable_filter.c static struct nf_hook_ops ebt_ops_filter · line 105

Quoted 12 lines
net/bridge/netfilter/ebtable_filter.c +1 -3
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_filter
 static int __net_init frame_filter_net_init(struct net *net)
 {
 	net->xt.frame_filter = ebt_register_table(net, &frame_filter);
-	if (IS_ERR(net->xt.frame_filter))
-		return PTR_ERR(net->xt.frame_filter);
-	return 0;
+	return PTR_RET(net->xt.frame_filter);
 }

i do not understand this,
ebt_register_table() return (struct ebt_table *) on success

Quoted 1 line

Does PTR_RET really return 0 if this is a propper pointer ?

Right. Here is how PTR_RET defined. This patch does not change any behavior.

Quoted 7 lines

static inline int __must_check PTR_RET(const void *ptr)

{      
        if (IS_ERR(ptr))
                return PTR_ERR(ptr);
        else   
                return 0;
}

Applied, thanks Fengguang.