Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df383e62 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

lwtunnel: fix memory leak 



The built lwtunnel_state struct has to be freed after comparison.

Fixes: 571e7226 ("ipv4: support for fib route lwtunnel encap attributes")
Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c938a003

include/net/lwtunnel.h

+6 −1
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ struct lwtunnel_encap_ops { 
};



#ifdef CONFIG_LWTUNNEL

static inline void lwtstate_free(struct lwtunnel_state *lws)

{

	kfree(lws);

}



static inline struct lwtunnel_state *

lwtstate_get(struct lwtunnel_state *lws)

{
@@ -51,7 +56,7 @@ static inline void lwtstate_put(struct lwtunnel_state *lws) 
		return;



	if (atomic_dec_and_test(&lws->refcnt))

		kfree(lws);

		lwtstate_free(lws);

}



static inline bool lwtunnel_output_redirect(struct lwtunnel_state *lwtstate)

net/ipv4/fib_semantics.c

+6 −4
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ int fib_encap_match(struct net *net, u16 encap_type, 
{

	struct lwtunnel_state *lwtstate;

	struct net_device *dev = NULL;

	int ret;

	int ret, result = 0;



	if (encap_type == LWTUNNEL_ENCAP_NONE)

		return 0;
@@ -548,10 +548,12 @@ int fib_encap_match(struct net *net, u16 encap_type, 
		dev = __dev_get_by_index(net, oif);

	ret = lwtunnel_build_state(dev, encap_type,

				   encap, &lwtstate);

	if (!ret)

		return lwtunnel_cmp_encap(lwtstate, nh->nh_lwtstate);

	if (!ret) {

		result = lwtunnel_cmp_encap(lwtstate, nh->nh_lwtstate);

		lwtstate_free(lwtstate);

	}



	return 0;

	return result;

}



int fib_nh_match(struct fib_config *cfg, struct fib_info *fi)