AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ip_tunnel: Add sanity checks to ip_tunnel_encap_add_ops()

Browse Source 
The symbols are exported and could be used by external modules.

Fixes: a8c5f9 ("ip_tunnel: Ops registration for secondary encap (fou, gue)")
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Graf 2014-12-16 21:05:20 +01:00 committed by David S. Miller
parent c9f2c3d36c
commit bb1553c800
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/ip_tunnel.c
View File

@ -514,6 +514,9 @@ const struct ip_tunnel_encap_ops __rcu *
int ip_tunnel_encap_add_ops(const struct ip_tunnel_encap_ops *ops, int ip_tunnel_encap_add_ops(const struct ip_tunnel_encap_ops *ops,
unsigned int num) unsigned int num)
{ {
if (num >= MAX_IPTUN_ENCAP_OPS)
return -ERANGE;
return !cmpxchg((const struct ip_tunnel_encap_ops **) return !cmpxchg((const struct ip_tunnel_encap_ops **)
&iptun_encaps[num], &iptun_encaps[num],
NULL, ops) ? 0 : -1; NULL, ops) ? 0 : -1;
@ -525,6 +528,9 @@ int ip_tunnel_encap_del_ops(const struct ip_tunnel_encap_ops *ops,
{ {
int ret; int ret;
if (num >= MAX_IPTUN_ENCAP_OPS)
return -ERANGE;
ret = (cmpxchg((const struct ip_tunnel_encap_ops **) ret = (cmpxchg((const struct ip_tunnel_encap_ops **)
&iptun_encaps[num], &iptun_encaps[num],
ops, NULL) == ops) ? 0 : -1; ops, NULL) == ops) ? 0 : -1;