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

xfrm: fix the return code when xfrm_*_register_afinfo failed

Browse source 
If xfrm_*_register_afinfo failed since xfrm_*_afinfo[afinfo->family] had the
value, return the -EEXIST, not -ENOBUFS

Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Li RongQing 2015-04-23 11:06:53 +08:00 • committed by Steffen Klassert
parent 800777026e
commit f31e8d4f7b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/xfrm/xfrm_input.c
View file

@ -29,7 +29,7 @@ int xfrm_input_register_afinfo(struct xfrm_input_afinfo *afinfo)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
spin_lock_bh(&xfrm_input_afinfo_lock); spin_lock_bh(&xfrm_input_afinfo_lock);
if (unlikely(xfrm_input_afinfo[afinfo->family] != NULL)) if (unlikely(xfrm_input_afinfo[afinfo->family] != NULL))
err = -ENOBUFS; err = -EEXIST;
else else
rcu_assign_pointer(xfrm_input_afinfo[afinfo->family], afinfo); rcu_assign_pointer(xfrm_input_afinfo[afinfo->family], afinfo);
spin_unlock_bh(&xfrm_input_afinfo_lock); spin_unlock_bh(&xfrm_input_afinfo_lock);

2
net/xfrm/xfrm_policy.c
View file

@ -2808,7 +2808,7 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
spin_lock(&xfrm_policy_afinfo_lock); spin_lock(&xfrm_policy_afinfo_lock);
if (unlikely(xfrm_policy_afinfo[afinfo->family] != NULL)) if (unlikely(xfrm_policy_afinfo[afinfo->family] != NULL))
err = -ENOBUFS; err = -EEXIST;
else { else {
struct dst_ops *dst_ops = afinfo->dst_ops; struct dst_ops *dst_ops = afinfo->dst_ops;
if (likely(dst_ops->kmem_cachep == NULL)) if (likely(dst_ops->kmem_cachep == NULL))

2
net/xfrm/xfrm_state.c
View file

@ -1908,7 +1908,7 @@ int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
spin_lock_bh(&xfrm_state_afinfo_lock); spin_lock_bh(&xfrm_state_afinfo_lock);
if (unlikely(xfrm_state_afinfo[afinfo->family] != NULL)) if (unlikely(xfrm_state_afinfo[afinfo->family] != NULL))
err = -ENOBUFS; err = -EEXIST;
else else
rcu_assign_pointer(xfrm_state_afinfo[afinfo->family], afinfo); rcu_assign_pointer(xfrm_state_afinfo[afinfo->family], afinfo);
spin_unlock_bh(&xfrm_state_afinfo_lock); spin_unlock_bh(&xfrm_state_afinfo_lock);