Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 785fd8b8 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[XFRM]: nlmsg length not computed correctly in the presence of subpolicies 



I actually dont have a test case for these; i just found them by
inspection. Refer to patch "[XFRM]: Sub-policies broke policy events"
for more info

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Acked-by: default avatarMasahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 334f3d45

net/xfrm/xfrm_user.c

+9 −1
Original line number Diff line number Diff line
@@ -1927,6 +1927,9 @@ 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));

#ifdef CONFIG_XFRM_SUB_POLICY

	len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));

#endif

	skb = alloc_skb(len, GFP_ATOMIC);

	if (skb == NULL)

		return -ENOMEM;
@@ -2034,6 +2037,9 @@ 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));

#ifdef CONFIG_XFRM_SUB_POLICY

	len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));

#endif

	skb = alloc_skb(len, GFP_ATOMIC);

	if (skb == NULL)

		return -ENOMEM;
@@ -2109,10 +2115,12 @@ static int xfrm_notify_policy_flush(struct km_event *c) 
	struct nlmsghdr *nlh;

	struct sk_buff *skb;

	unsigned char *b;

	int len = 0;

#ifdef CONFIG_XFRM_SUB_POLICY

	struct xfrm_userpolicy_type upt;

	len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));

#endif

	int len = NLMSG_LENGTH(0);

	len += NLMSG_LENGTH(0);



	skb = alloc_skb(len, GFP_ATOMIC);

	if (skb == NULL)