evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2015-02-24 19:34:01 +01:00
commit 8f711a601d
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/netfilter/ipvs/ip_vs_sync.c
View file

@ -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"); IP_VS_DBG(2, "BACKUP, add new conn. failed\n");
return; return;
} }
if (!(flags & IP_VS_CONN_F_TEMPLATE))
kfree(param->pe_data);
} }
if (opt) 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) (opt_flags & IPVS_OPT_F_SEQ_DATA ? &opt : NULL)
); );
#endif #endif
ip_vs_pe_put(param.pe);
return 0; return 0;
/* Error exit */ /* Error exit */
out: out: