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

Commit 8f711a60 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs 



Simon Horman says:

====================
Second Round of IPVS Fixes for v3.20

This patch resolves some memory leaks in connection
synchronisation code that date back to v2.6.39.
====================

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 02263db0 528c943f

net/netfilter/ipvs/ip_vs_sync.c

+3 −0
Original line number Diff line number Diff line
@@ -896,6 +896,8 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, 
			IP_VS_DBG(2, "BACKUP, add new conn. failed\n");

			return;

		}

		if (!(flags & IP_VS_CONN_F_TEMPLATE))

			kfree(param->pe_data);

	}



	if (opt)
@@ -1169,6 +1171,7 @@ static inline int ip_vs_proc_sync_conn(struct net *net, __u8 *p, __u8 *msg_end) 
				(opt_flags & IPVS_OPT_F_SEQ_DATA ? &opt : NULL)

				);

#endif

	ip_vs_pe_put(param.pe);

	return 0;

	/* Error exit */

out: