Skip to content

Commit

Permalink
[XFRM]: Make flush notifier prettier when subpolicy used
Browse files Browse the repository at this point in the history
Might as well make flush notifier prettier when subpolicy used

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jamal Hadi Salim authored and David S. Miller committed Dec 3, 2006
1 parent 46ca5f5 commit 0c51f53
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions net/xfrm/xfrm_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -2113,7 +2113,6 @@ static int xfrm_notify_policy_flush(struct km_event *c)
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
len += NLMSG_LENGTH(0);
Expand All @@ -2126,22 +2125,15 @@ static int xfrm_notify_policy_flush(struct km_event *c)

nlh = NLMSG_PUT(skb, c->pid, c->seq, XFRM_MSG_FLUSHPOLICY, 0);
nlh->nlmsg_flags = 0;

#ifdef CONFIG_XFRM_SUB_POLICY
memset(&upt, 0, sizeof(upt));
upt.type = c->data.type;
RTA_PUT(skb, XFRMA_POLICY_TYPE, sizeof(upt), &upt);
#endif
if (copy_to_user_policy_type(c->data.type, skb) < 0)
goto nlmsg_failure;

nlh->nlmsg_len = skb->tail - b;

NETLINK_CB(skb).dst_group = XFRMNLGRP_POLICY;
return netlink_broadcast(xfrm_nl, skb, 0, XFRMNLGRP_POLICY, GFP_ATOMIC);

nlmsg_failure:
#ifdef CONFIG_XFRM_SUB_POLICY
rtattr_failure:
#endif
kfree_skb(skb);
return -1;
}
Expand Down

0 comments on commit 0c51f53

Please sign in to comment.