[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>

net/802/p8023.c

@@ -54,7 +54,6 @@ struct datalink_proto *make_8023_client(void)
  */
 void destroy_8023_client(struct datalink_proto *dl)
 {
-	if (dl)
 	kfree(dl);
 }
 

net/ax25/af_ax25.c

@@ -1138,10 +1138,8 @@ static int ax25_connect(struct socket *sock, struct sockaddr *uaddr,
 	sk->sk_state   = TCP_CLOSE;
 	sock->state = SS_UNCONNECTED;
 
-	if (ax25->digipeat != NULL) {
 	kfree(ax25->digipeat);
 	ax25->digipeat = NULL;
-	}
 
 	/*
 	 *	Handle digi-peaters to be used.

net/ax25/ax25_in.c

@@ -401,10 +401,8 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
 	}
 
 	if (dp.ndigi == 0) {
-		if (ax25->digipeat != NULL) {
 		kfree(ax25->digipeat);
 		ax25->digipeat = NULL;
-		}
 	} else {
 		/* Reverse the source SABM's path */
 		memcpy(ax25->digipeat, &reverse_dp, sizeof(ax25_digi));

net/ax25/ax25_route.c

@@ -54,14 +54,12 @@ void ax25_rt_device_down(struct net_device *dev)
 		if (s->dev == dev) {
 			if (ax25_route_list == s) {
 				ax25_route_list = s->next;
-				if (s->digipeat != NULL)
 				kfree(s->digipeat);
 				kfree(s);
 			} else {
 				for (t = ax25_route_list; t != NULL; t = t->next) {
 					if (t->next == s) {
 						t->next = s->next;
-						if (s->digipeat != NULL)
 						kfree(s->digipeat);
 						kfree(s);
 						break;
@@ -90,10 +88,8 @@ static int ax25_rt_add(struct ax25_routes_struct *route)
 	while (ax25_rt != NULL) {
 		if (ax25cmp(&ax25_rt->callsign, &route->dest_addr) == 0 &&
 		            ax25_rt->dev == ax25_dev->dev) {
-			if (ax25_rt->digipeat != NULL) {
 			kfree(ax25_rt->digipeat);
 			ax25_rt->digipeat = NULL;
-			}
 			if (route->digi_count != 0) {
 				if ((ax25_rt->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
 					write_unlock(&ax25_route_lock);
@@ -145,7 +141,6 @@ static int ax25_rt_add(struct ax25_routes_struct *route)
 static void ax25_rt_destroy(ax25_route *ax25_rt)
 {
 	if (atomic_read(&ax25_rt->ref) == 0) {
-		if (ax25_rt->digipeat != NULL)
 		kfree(ax25_rt->digipeat);
 		kfree(ax25_rt);
 		return;
@@ -530,9 +525,7 @@ void __exit ax25_rt_free(void)
 		s       = ax25_rt;
 		ax25_rt = ax25_rt->next;
 
-		if (s->digipeat != NULL)
 		kfree(s->digipeat);
-
 		kfree(s);
 	}
 	write_unlock(&ax25_route_lock);

net/bluetooth/hidp/core.c

@@ -660,9 +660,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
 failed:
 	up_write(&hidp_session_sem);
 
-	if (session->input)
 	kfree(session->input);
-
 	kfree(session);
 	return err;
 }

net/core/dev_mcast.c

@@ -194,7 +194,6 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
 
 done:
 	spin_unlock_bh(&dev->xmit_lock);
-	if (dmi1)
 	kfree(dmi1);
 	return err;
 }

net/core/sock.c

@@ -1242,7 +1242,6 @@ static void sock_def_write_space(struct sock *sk)
 
 static void sock_def_destruct(struct sock *sk)
 {
-	if (sk->sk_protinfo)
 	kfree(sk->sk_protinfo);
 }
 

net/dccp/ipv4.c

@@ -1263,10 +1263,8 @@ static int dccp_v4_destroy_sock(struct sock *sk)
 	if (inet_csk(sk)->icsk_bind_hash != NULL)
 		inet_put_port(&dccp_hashinfo, sk);
 
-	if (dp->dccps_service_list != NULL) {
 	kfree(dp->dccps_service_list);
 	dp->dccps_service_list = NULL;
-	}
 
 	ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk);
 	ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk);

net/dccp/proto.c

@@ -238,7 +238,6 @@ static int dccp_setsockopt_service(struct sock *sk, const u32 service,
 	lock_sock(sk);
 	dp->dccps_service = service;
 
-	if (dp->dccps_service_list != NULL)
 	kfree(dp->dccps_service_list);
 
 	dp->dccps_service_list = sl;

net/decnet/dn_table.c

@@ -791,9 +791,7 @@ static void dn_fib_del_tree(int n)
 	dn_fib_tables[n] = NULL;
 	write_unlock(&dn_fib_tables_lock);
 
-        if (t) {
 	kfree(t);
-        }
 }
 
 struct dn_fib_table *dn_fib_empty_table(void)

net/ethernet/pe2.c

@@ -32,7 +32,6 @@ struct datalink_proto *make_EII_client(void)
 
 void destroy_EII_client(struct datalink_proto *dl)
 {
-	if (dl)
 	kfree(dl);
 }
 

net/ipv4/af_inet.c

@@ -147,7 +147,6 @@ 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);
 	dst_release(sk->sk_dst_cache);
 	sk_refcnt_debug_dec(sk);

net/ipv4/fib_frontend.c

@@ -266,7 +266,6 @@ 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);
 		}
 		rtnl_unlock();

net/ipv4/ip_options.c

@@ -510,7 +510,6 @@ static int ip_options_get_finish(struct ip_options **optp,
 		kfree(opt);
 		return -EINVAL;
 	}
-	if (*optp)
 	kfree(*optp);
 	*optp = opt;
 	return 0;

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;
-	}
 	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;
-	}
 	if (inet->cork.rt) {
 		ip_rt_put(inet->cork.rt);
 		inet->cork.rt = NULL;

net/ipv4/ip_sockglue.c

@@ -202,7 +202,6 @@ 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);
 				return -EADDRINUSE;
 			}
@@ -446,7 +445,6 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
 #endif
 			}
 			opt = xchg(&inet->opt, opt);
-			if (opt)
 			kfree(opt);
 			break;
 		}
@@ -828,9 +826,7 @@ 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);
 			break;
 		}

net/ipv4/ipvs/ip_vs_app.c

@@ -110,7 +110,6 @@ 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);
 	return ret;
@@ -136,7 +135,6 @@ 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);
 }

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);
-
 		last_mpc = mpc;
 	}
 
-	if (last_mpc) {
 	/* concurrent __multipath_flush may lead to !last_mpc */
 	kfree(last_mpc);
-	}
 
 	decision->u.dst.__use++;
 	*rp = decision;

net/ipv4/netfilter/ip_nat_snmp_basic.c

@@ -1161,7 +1161,6 @@ static int snmp_parse_mangle(unsigned char *msg,
 		
 		if (!snmp_object_decode(&ctx, obj)) {
 			if (*obj) {
-				if ((*obj)->id)
 				kfree((*obj)->id);
 				kfree(*obj);
 			}	

net/ipv4/tcp_ipv4.c

@@ -823,7 +823,6 @@ static int tcp_v4_send_synack(struct sock *sk, struct request_sock *req,
  */
 static void tcp_v4_reqsk_destructor(struct request_sock *req)
 {
-	if (inet_rsk(req)->opt)
 	kfree(inet_rsk(req)->opt);
 }
 

net/ipv6/addrconf.c

@@ -3090,7 +3090,6 @@ static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
 
 nlmsg_failure:
 rtattr_failure:
-	if (array)
 	kfree(array);
 	skb_trim(skb, b - skb->data);
 	return -1;

net/ipv6/ip6_output.c

@@ -587,7 +587,6 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
 			skb->next = NULL;
 		}
 
-		if (tmp_hdr)
 		kfree(tmp_hdr);
 
 		if (err == 0) {
@@ -1186,10 +1185,8 @@ int ip6_push_pending_frames(struct sock *sk)
 
 out:
 	inet->cork.flags &= ~IPCORK_OPT;
-	if (np->cork.opt) {
 	kfree(np->cork.opt);
 	np->cork.opt = NULL;
-	}
 	if (np->cork.rt) {
 		dst_release(&np->cork.rt->u.dst);
 		np->cork.rt = NULL;
@@ -1214,10 +1211,8 @@ void ip6_flush_pending_frames(struct sock *sk)
 
 	inet->cork.flags &= ~IPCORK_OPT;
 
-	if (np->cork.opt) {
 	kfree(np->cork.opt);
 	np->cork.opt = NULL;
-	}
 	if (np->cork.rt) {
 		dst_release(&np->cork.rt->u.dst);
 		np->cork.rt = NULL;

net/ipv6/ip6_tunnel.c

@@ -756,7 +756,6 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
 	}
 	ip6_tnl_dst_store(t, dst);
 
-	if (opt)
 	kfree(opt);
 
 	t->recursion--;
@@ -766,7 +765,6 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
 	dst_link_failure(skb);
 tx_err_dst_release:
 	dst_release(dst);
-	if (opt)
 	kfree(opt);
 tx_err:
 	stats->tx_errors++;

net/ipv6/ipcomp6.c

@@ -130,7 +130,6 @@ static int ipcomp6_input(struct xfrm_state *x, struct xfrm_decap_state *decap, s
 out_put_cpu:
 	put_cpu();
 out:
-	if (tmp_hdr)
 	kfree(tmp_hdr);
 	if (err)
 		goto error_out;

net/ipv6/ipv6_sockglue.c

@@ -80,7 +80,6 @@ int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *))
 		if (ra->sk == sk) {
 			if (sel>=0) {
 				write_unlock_bh(&ip6_ra_lock);
-				if (new_ra)
 				kfree(new_ra);
 				return -EADDRINUSE;
 			}

net/irda/discovery.c

@@ -194,7 +194,6 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
 
 			/* Remove it from the log */
 			curr = hashbin_remove_this(log, (irda_queue_t *) curr);
-			if (curr)
 			kfree(curr);
 		}
 	}

net/irda/irias_object.c

@@ -122,7 +122,6 @@ static void __irias_delete_attrib(struct ias_attrib *attrib)
 	IRDA_ASSERT(attrib != NULL, return;);
 	IRDA_ASSERT(attrib->magic == IAS_ATTRIB_MAGIC, return;);
 
-	if (attrib->name)
 	kfree(attrib->name);
 
 	irias_delete_value(attrib->value);
@@ -136,7 +135,6 @@ void __irias_delete_object(struct ias_object *obj)
 	IRDA_ASSERT(obj != NULL, return;);
 	IRDA_ASSERT(obj->magic == IAS_OBJECT_MAGIC, return;);
 
-	if (obj->name)
 	kfree(obj->name);
 
 	hashbin_delete(obj->attribs, (FREE_FUNC) __irias_delete_attrib);
@@ -562,13 +560,11 @@ void irias_delete_value(struct ias_value *value)
 		/* No need to deallocate */
 		break;
 	case IAS_STRING:
-		/* If string, deallocate string */
-		if (value->t.string != NULL)
+		/* Deallocate string */
 		kfree(value->t.string);
 		break;
 	case IAS_OCT_SEQ:
-		/* If byte stream, deallocate byte stream */
-		 if (value->t.oct_seq != NULL)
+		/* Deallocate byte stream */
 		 kfree(value->t.oct_seq);
 		 break;
 	default:

net/rose/rose_route.c

@@ -240,7 +240,6 @@ static void rose_remove_neigh(struct rose_neigh *rose_neigh)
 	if ((s = rose_neigh_list) == rose_neigh) {
 		rose_neigh_list = rose_neigh->next;
 		spin_unlock_bh(&rose_neigh_list_lock);
-		if (rose_neigh->digipeat != NULL)
 		kfree(rose_neigh->digipeat);
 		kfree(rose_neigh);
 		return;
@@ -250,7 +249,6 @@ static void rose_remove_neigh(struct rose_neigh *rose_neigh)
 		if (s->next == rose_neigh) {
 			s->next = rose_neigh->next;
 			spin_unlock_bh(&rose_neigh_list_lock);
-			if (rose_neigh->digipeat != NULL)
 			kfree(rose_neigh->digipeat);
 			kfree(rose_neigh);
 			return;

net/sched/cls_fw.c

@@ -298,7 +298,6 @@ static int fw_change(struct tcf_proto *tp, unsigned long base,
 	return 0;
 
 errout:
-	if (f)
 	kfree(f);
 	return err;
 }

net/sched/cls_route.c

@@ -525,7 +525,6 @@ static int route4_change(struct tcf_proto *tp, unsigned long base,
 	return 0;
 
 errout:
-	if (f)
 	kfree(f);
 	return err;
 }

net/sched/cls_rsvp.h

@@ -555,7 +555,6 @@ static int rsvp_change(struct tcf_proto *tp, unsigned long base,
 	goto insert;
 
 errout:
-	if (f)
 	kfree(f);
 errout2:
 	tcf_exts_destroy(tp, &e);

net/sched/cls_tcindex.c

@@ -194,7 +194,6 @@ __tcindex_delete(struct tcf_proto *tp, unsigned long arg, int lock)
 	}
 	tcf_unbind_filter(tp, &r->res);
 	tcf_exts_destroy(tp, &r->exts);
-	if (f)
 	kfree(f);
 	return 0;
 }
@@ -442,9 +441,7 @@ static void tcindex_destroy(struct tcf_proto *tp)
 	walker.skip = 0;
 	walker.fn = &tcindex_destroy_element;
 	tcindex_walk(tp,&walker);
-	if (p->perfect)
 	kfree(p->perfect);
-	if (p->h)
 	kfree(p->h);
 	kfree(p);
 	tp->root = NULL;

net/sched/cls_u32.c

@@ -347,7 +347,7 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n)
 	if (n->ht_down)
 		n->ht_down->refcnt--;
 #ifdef CONFIG_CLS_U32_PERF
-	if (n && (NULL != n->pf))
+	if (n)
 		kfree(n->pf);
 #endif
 	kfree(n);
@@ -680,7 +680,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle,
 		return 0;
 	}
 #ifdef CONFIG_CLS_U32_PERF
-	if (n && (NULL != n->pf))
+	if (n)
 		kfree(n->pf);
 #endif
 	kfree(n);

net/sched/em_meta.c

@@ -561,7 +561,6 @@ static int meta_var_change(struct meta_value *dst, struct rtattr *rta)
 
 static void meta_var_destroy(struct meta_value *v)
 {
-	if (v->val)
 	kfree((void *) v->val);
 }
 

net/sctp/associola.c

@@ -344,9 +344,7 @@ void sctp_association_free(struct sctp_association *asoc)
 	}
 
 	/* Free peer's cached cookie. */
-	if (asoc->peer.cookie) {
 	kfree(asoc->peer.cookie);
-	}
 
 	/* Release the transport structures. */
 	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {

net/sctp/sm_make_chunk.c

@@ -254,7 +254,6 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
 	aiparam.adaption_ind = htonl(sp->adaption_ind);
 	sctp_addto_chunk(retval, sizeof(aiparam), &aiparam);
 nodata:
-	if (addrs.v)
 	kfree(addrs.v);
 	return retval;
 }
@@ -347,7 +346,6 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
 nomem_chunk:
 	kfree(cookie);
 nomem_cookie:
-	if (addrs.v)
 	kfree(addrs.v);
 	return retval;
 }

net/sunrpc/auth_gss/gss_krb5_seal.c

@@ -143,6 +143,6 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
 
 	return ((ctx->endtime < now) ? GSS_S_CONTEXT_EXPIRED : GSS_S_COMPLETE);
 out_err:
-	if (md5cksum.data) kfree(md5cksum.data);
+	kfree(md5cksum.data);
 	return GSS_S_FAILURE;
 }

net/sunrpc/auth_gss/gss_krb5_unseal.c

@@ -176,6 +176,6 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
 
 	ret = GSS_S_COMPLETE;
 out:
-	if (md5cksum.data) kfree(md5cksum.data);
+	kfree(md5cksum.data);
 	return ret;
 }

net/sunrpc/auth_gss/gss_mech_switch.c

@@ -60,7 +60,6 @@ gss_mech_free(struct gss_api_mech *gm)
 
 	for (i = 0; i < gm->gm_pf_num; i++) {
 		pf = &gm->gm_pfs[i];
-		if (pf->auth_domain_name)
 		kfree(pf->auth_domain_name);
 		pf->auth_domain_name = NULL;
 	}

net/sunrpc/auth_gss/gss_spkm3_seal.c

@@ -122,7 +122,6 @@ spkm3_make_token(struct spkm3_ctx *ctx,
 
 	return  GSS_S_COMPLETE;
 out_err:
-	if (md5cksum.data) 
 	kfree(md5cksum.data);
 	token->data = NULL;
 	token->len = 0;

net/sunrpc/auth_gss/gss_spkm3_token.c

@@ -259,7 +259,6 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
 
 	ret = GSS_S_COMPLETE;
 out:
-	if (spkm3_ctx_id.data)
 	kfree(spkm3_ctx_id.data);
 	return ret;
 }

net/sunrpc/auth_gss/gss_spkm3_unseal.c

@@ -120,9 +120,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,
 	/* XXX: need to add expiration and sequencing */
 	ret = GSS_S_COMPLETE;
 out:
-	if (md5cksum.data) 
 	kfree(md5cksum.data);
-	if (wire_cksum.data) 
 	kfree(wire_cksum.data);
 	return ret;
 }

net/sunrpc/svc.c

@@ -196,11 +196,8 @@ svc_exit_thread(struct svc_rqst *rqstp)
 	struct svc_serv	*serv = rqstp->rq_server;
 
 	svc_release_buffer(rqstp);
-	if (rqstp->rq_resp)
 	kfree(rqstp->rq_resp);
-	if (rqstp->rq_argp)
 	kfree(rqstp->rq_argp);
-	if (rqstp->rq_auth_data)
 	kfree(rqstp->rq_auth_data);
 	kfree(rqstp);
 

net/sunrpc/xdr.c

@@ -992,7 +992,6 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base,
 	err = 0;
 
 out:
-	if (elem)
 	kfree(elem);
 	if (ppages)
 		kunmap(*ppages);

net/wanrouter/af_wanpipe.c

@@ -1099,7 +1099,7 @@ static void release_driver(struct sock *sk)
 	sock_reset_flag(sk, SOCK_ZAPPED);
 	wp = wp_sk(sk);
 
-	if (wp && wp->mbox) {
+	if (wp) {
 		kfree(wp->mbox);
 		wp->mbox = NULL;
 	}
@@ -1186,10 +1186,8 @@ static void wanpipe_kill_sock_timer (unsigned long data)
 		return;
 	}
 
-	if (wp_sk(sk)) {
 	kfree(wp_sk(sk));
 	wp_sk(sk) = NULL;
-	}
 
 	if (atomic_read(&sk->sk_refcnt) != 1) {
 		atomic_set(&sk->sk_refcnt, 1);
@@ -1219,10 +1217,8 @@ static void wanpipe_kill_sock_accept (struct sock *sk)
 	sk->sk_socket = NULL;
 
 
-	if (wp_sk(sk)) {
 	kfree(wp_sk(sk));
 	wp_sk(sk) = NULL;
-	}
 
 	if (atomic_read(&sk->sk_refcnt) != 1) {
 		atomic_set(&sk->sk_refcnt, 1);
@@ -1243,10 +1239,8 @@ static void wanpipe_kill_sock_irq (struct sock *sk)
 
 	sk->sk_socket = NULL;
 
-	if (wp_sk(sk)) {
 	kfree(wp_sk(sk));
 	wp_sk(sk) = NULL;
-	}
 
 	if (atomic_read(&sk->sk_refcnt) != 1) {
 		atomic_set(&sk->sk_refcnt, 1);

net/wanrouter/wanmain.c

@@ -714,10 +714,8 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
 	}
 
 	/* This code has moved from del_if() function */
-	if (dev->priv) {
 	kfree(dev->priv);
 	dev->priv = NULL;
-	}
 
 #ifdef CONFIG_WANPIPE_MULTPPP
 	if (cnf->config_id == WANCONFIG_MPPP)
@@ -851,10 +849,8 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
 
 	/* Due to new interface linking method using dev->priv,
 	 * this code has moved from del_if() function.*/
-	if (dev->priv){
 	kfree(dev->priv);
 	dev->priv=NULL;
-	}
 
 	unregister_netdev(dev);
 

net/xfrm/xfrm_state.c

@@ -62,13 +62,9 @@ static void xfrm_state_gc_destroy(struct xfrm_state *x)
 {
 	if (del_timer(&x->timer))
 		BUG();
-	if (x->aalg)
 	kfree(x->aalg);
-	if (x->ealg)
 	kfree(x->ealg);
-	if (x->calg)
 	kfree(x->calg);
-	if (x->encap)
 	kfree(x->encap);
 	if (x->type) {
 		x->type->destructor(x);