[NET]: kfree cleanup

From: Jesper Juhl <jesper.juhl@gmail.com>

This is the net/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in net/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>

9 files changed, 18 insertions, 37 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index a9d84f93442c..eaa150c33b04 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -147,8 +147,7 @@ void inet_sock_destruct(struct sock *sk)
         BUG_TRAP(!sk->sk_wmem_queued);
         BUG_TRAP(!sk->sk_forward_alloc);
 
-        if (inet->opt)
-                kfree(inet->opt);
+        kfree(inet->opt);
         dst_release(sk->sk_dst_cache);
         sk_refcnt_debug_dec(sk);
 }
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 990633c09dfe..2267c1fad879 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -266,8 +266,7 @@ int ip_rt_ioctl(unsigned int cmd, void __user *arg)
                                 if (tb)
                                         err = tb->tb_insert(tb, &req.rtm, &rta, &req.nlh, NULL);
                         }
-                        if (rta.rta_mx)
-                                kfree(rta.rta_mx);
+                        kfree(rta.rta_mx);
                 }
                 rtnl_unlock();
                 return err;
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index bce4e875193b..dbe12da8d8b3 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -510,8 +510,7 @@ static int ip_options_get_finish(struct ip_options **optp,
                 kfree(opt);
                 return -EINVAL;
         }
-        if (*optp)
-                kfree(*optp);
+        kfree(*optp);
         *optp = opt;
         return 0;
 }
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 17758234a3e3..df7f20da422d 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1262,10 +1262,8 @@ int ip_push_pending_frames(struct sock *sk)
 
 out:
         inet->cork.flags &= ~IPCORK_OPT;
-        if (inet->cork.opt) {
-                kfree(inet->cork.opt);
-                inet->cork.opt = NULL;
-        }
+        kfree(inet->cork.opt);
+        inet->cork.opt = NULL;
         if (inet->cork.rt) {
                 ip_rt_put(inet->cork.rt);
                 inet->cork.rt = NULL;
@@ -1289,10 +1287,8 @@ void ip_flush_pending_frames(struct sock *sk)
                 kfree_skb(skb);
 
         inet->cork.flags &= ~IPCORK_OPT;
-        if (inet->cork.opt) {
-                kfree(inet->cork.opt);
-                inet->cork.opt = NULL;
-        }
+        kfree(inet->cork.opt);
+        inet->cork.opt = NULL;
         if (inet->cork.rt) {
                 ip_rt_put(inet->cork.rt);
                 inet->cork.rt = NULL;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 2f0b47da5b37..4f2d87257309 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -202,8 +202,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct s
                 if (ra->sk == sk) {
                         if (on) {
                                 write_unlock_bh(&ip_ra_lock);
-                                if (new_ra)
-                                        kfree(new_ra);
+                                kfree(new_ra);
                                 return -EADDRINUSE;
                         }
                         *rap = ra->next;
@@ -446,8 +445,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
 #endif
                         }
                         opt = xchg(&inet->opt, opt);
-                        if (opt)
-                                kfree(opt);
+                        kfree(opt);
                         break;
                 }
                 case IP_PKTINFO:
@@ -828,10 +826,8 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
 
                         err = ip_mc_msfilter(sk, msf, ifindex);
 mc_msf_out:
-                        if (msf)
-                                kfree(msf);
-                        if (gsf)
-                                kfree(gsf);
+                        kfree(msf);
+                        kfree(gsf);
                         break;
                 }
                 case IP_ROUTER_ALERT:   
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index fc6f95aaa969..d7eb680101c2 100644
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -110,8 +110,7 @@ ip_vs_app_inc_new(struct ip_vs_app *app, __u16 proto, __u16 port)
         return 0;
 
   out:
-        if (inc->timeout_table)
-                kfree(inc->timeout_table);
+        kfree(inc->timeout_table);
         kfree(inc);
         return ret;
 }
@@ -136,8 +135,7 @@ ip_vs_app_inc_release(struct ip_vs_app *inc)
 
         list_del(&inc->a_list);
 
-        if (inc->timeout_table != NULL)
-                kfree(inc->timeout_table);
+        kfree(inc->timeout_table);
         kfree(inc);
 }
 
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c
index bd7d75b6abe0..d34a9fa608e0 100644
--- a/net/ipv4/multipath_wrandom.c
+++ b/net/ipv4/multipath_wrandom.c
@@ -207,16 +207,12 @@ static void wrandom_select_route(const struct flowi *flp,
                         decision = mpc->rt;
 
                 last_power = mpc->power;
-                if (last_mpc)
-                        kfree(last_mpc);
-
+                kfree(last_mpc);
                 last_mpc = mpc;
         }
 
-        if (last_mpc) {
-                /* concurrent __multipath_flush may lead to !last_mpc */
-                kfree(last_mpc);
-        }
+        /* concurrent __multipath_flush may lead to !last_mpc */
+        kfree(last_mpc);
 
         decision->u.dst.__use++;
         *rp = decision;
diff --git a/net/ipv4/netfilter/ip_nat_snmp_basic.c b/net/ipv4/netfilter/ip_nat_snmp_basic.c
index 93b2c5111bb2..8acb7ed40b47 100644
--- a/net/ipv4/netfilter/ip_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c
@@ -1161,8 +1161,7 @@ static int snmp_parse_mangle(unsigned char *msg,
                 
                 if (!snmp_object_decode(&ctx, obj)) {
                         if (*obj) {
-                                if ((*obj)->id)
-                                        kfree((*obj)->id);
+                                kfree((*obj)->id);
                                 kfree(*obj);
                         }       
                         kfree(obj);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 49d67cd75edd..634dabb558fd 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -823,8 +823,7 @@ out:
  */
 static void tcp_v4_reqsk_destructor(struct request_sock *req)
 {
-        if (inet_rsk(req)->opt)
-                kfree(inet_rsk(req)->opt);
+        kfree(inet_rsk(req)->opt);
 }
 
 static inline void syn_flood_warning(struct sk_buff *skb)