redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[XFRM]: Make copy_to_user_policy_type take a type

Browse source 
Make copy_to_user_policy_type take a type instead a policy and
fix its users to pass the type

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jamal Hadi Salim 2006-11-20 16:51:22 -08:00 committed by David S. Miller
parent 746859625d
commit 1459bb36b1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/xfrm/xfrm_user.c
View file

@ -1083,12 +1083,12 @@ static inline int copy_to_user_sec_ctx(struct xfrm_policy *xp, struct sk_buff *s
} }
#ifdef CONFIG_XFRM_SUB_POLICY #ifdef CONFIG_XFRM_SUB_POLICY
static int copy_to_user_policy_type(struct xfrm_policy *xp, struct sk_buff *skb) static int copy_to_user_policy_type(__u8 type, struct sk_buff *skb)
{ {
struct xfrm_userpolicy_type upt; struct xfrm_userpolicy_type upt;
memset(&upt, 0, sizeof(upt)); memset(&upt, 0, sizeof(upt));
upt.type = xp->type; upt.type = type;
RTA_PUT(skb, XFRMA_POLICY_TYPE, sizeof(upt), &upt); RTA_PUT(skb, XFRMA_POLICY_TYPE, sizeof(upt), &upt);
@ -1099,7 +1099,7 @@ rtattr_failure:
} }
#else #else
static inline int copy_to_user_policy_type(struct xfrm_policy *xp, struct sk_buff *skb) static inline int copy_to_user_policy_type(__u8 type, struct sk_buff *skb)
{ {
return 0; return 0;
} }
@ -1128,7 +1128,7 @@ static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_sec_ctx(xp, skb)) if (copy_to_user_sec_ctx(xp, skb))
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_policy_type(xp, skb) < 0) if (copy_to_user_policy_type(xp->type, skb) < 0)
goto nlmsg_failure; goto nlmsg_failure;
nlh->nlmsg_len = skb->tail - b; nlh->nlmsg_len = skb->tail - b;
@ -1908,7 +1908,7 @@ static int build_acquire(struct sk_buff *skb, struct xfrm_state *x,
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_state_sec_ctx(x, skb)) if (copy_to_user_state_sec_ctx(x, skb))
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_policy_type(xp, skb) < 0) if (copy_to_user_policy_type(xp->type, skb) < 0)
goto nlmsg_failure; goto nlmsg_failure;
nlh->nlmsg_len = skb->tail - b; nlh->nlmsg_len = skb->tail - b;
@ -2018,7 +2018,7 @@ static int build_polexpire(struct sk_buff *skb, struct xfrm_policy *xp,
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_sec_ctx(xp, skb)) if (copy_to_user_sec_ctx(xp, skb))
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_policy_type(xp, skb) < 0) if (copy_to_user_policy_type(xp->type, skb) < 0)
goto nlmsg_failure; goto nlmsg_failure;
upe->hard = !!hard; upe->hard = !!hard;
@ -2097,7 +2097,7 @@ static int xfrm_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *
copy_to_user_policy(xp, p, dir); copy_to_user_policy(xp, p, dir);
if (copy_to_user_tmpl(xp, skb) < 0) if (copy_to_user_tmpl(xp, skb) < 0)
goto nlmsg_failure; goto nlmsg_failure;
if (copy_to_user_policy_type(xp, skb) < 0) if (copy_to_user_policy_type(xp->type, skb) < 0)
goto nlmsg_failure; goto nlmsg_failure;
nlh->nlmsg_len = skb->tail - b; nlh->nlmsg_len = skb->tail - b;