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

xfrm: add XFRMA_REPLAY_VAL attribute to SA messages

Browse Source 
After this commit, the attribute XFRMA_REPLAY_VAL is added when no ESN replay
value is defined. Thus sequence number values are always notified to userspace.

Signed-off-by: dingzhi <zhi.ding@6wind.com>
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
dingzhi 2014-10-30 09:39:36 +01:00 committed by Steffen Klassert
parent 5c1e9f2c1f
commit f293a5e33e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/xfrm/xfrm_user.c
View File

@ -824,13 +824,15 @@ static int copy_to_user_state_extra(struct xfrm_state *x,
ret = xfrm_mark_put(skb, &x->mark); ret = xfrm_mark_put(skb, &x->mark);
if (ret) if (ret)
goto out; goto out;
if (x->replay_esn) { if (x->replay_esn)
ret = nla_put(skb, XFRMA_REPLAY_ESN_VAL, ret = nla_put(skb, XFRMA_REPLAY_ESN_VAL,
xfrm_replay_state_esn_len(x->replay_esn), xfrm_replay_state_esn_len(x->replay_esn),
x->replay_esn); x->replay_esn);
if (ret) else
goto out; ret = nla_put(skb, XFRMA_REPLAY_VAL, sizeof(x->replay),
} &x->replay);
if (ret)
goto out;
if (x->security) if (x->security)
ret = copy_sec_ctx(x->security, skb); ret = copy_sec_ctx(x->security, skb);
out: out:
@ -2569,6 +2571,8 @@ static inline size_t xfrm_sa_len(struct xfrm_state *x)
l += nla_total_size(sizeof(x->tfcpad)); l += nla_total_size(sizeof(x->tfcpad));
if (x->replay_esn) if (x->replay_esn)
l += nla_total_size(xfrm_replay_state_esn_len(x->replay_esn)); l += nla_total_size(xfrm_replay_state_esn_len(x->replay_esn));
else
l += nla_total_size(sizeof(struct xfrm_replay_state));
if (x->security) if (x->security)
l += nla_total_size(sizeof(struct xfrm_user_sec_ctx) + l += nla_total_size(sizeof(struct xfrm_user_sec_ctx) +
x->security->ctx_len); x->security->ctx_len);