|
@@ -272,9 +272,8 @@ static int attach_encap_tmpl(struct xfrm_encap_tmpl **encapp, struct rtattr *u_a
|
|
|
}
|
|
|
|
|
|
|
|
|
-static inline int xfrm_user_sec_ctx_size(struct xfrm_policy *xp)
|
|
|
+static inline int xfrm_user_sec_ctx_size(struct xfrm_sec_ctx *xfrm_ctx)
|
|
|
{
|
|
|
- struct xfrm_sec_ctx *xfrm_ctx = xp->security;
|
|
|
int len = 0;
|
|
|
|
|
|
if (xfrm_ctx) {
|
|
@@ -2170,7 +2169,7 @@ static int xfrm_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *xt,
|
|
|
|
|
|
len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
|
|
|
len += NLMSG_SPACE(sizeof(struct xfrm_user_acquire));
|
|
|
- len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
|
|
|
+ len += RTA_SPACE(xfrm_user_sec_ctx_size(x->security));
|
|
|
#ifdef CONFIG_XFRM_SUB_POLICY
|
|
|
len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
|
|
|
#endif
|
|
@@ -2280,7 +2279,7 @@ static int xfrm_exp_policy_notify(struct xfrm_policy *xp, int dir, struct km_eve
|
|
|
|
|
|
len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
|
|
|
len += NLMSG_SPACE(sizeof(struct xfrm_user_polexpire));
|
|
|
- len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
|
|
|
+ len += RTA_SPACE(xfrm_user_sec_ctx_size(xp->security));
|
|
|
#ifdef CONFIG_XFRM_SUB_POLICY
|
|
|
len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
|
|
|
#endif
|