diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index c5a4d7a7b8df..5f19800b41c5 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -520,7 +520,6 @@ struct xfrm_user_offload { #define XFRM_OFFLOAD_INBOUND 2 struct xfrm_userpolicy_default { -#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8) __u8 dirmask; __u8 action; }; diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index efbc48c85a8b..344d7d34491b 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1906,14 +1906,9 @@ static int xfrm_set_default(struct sk_buff *skb, struct nlmsghdr *nlh, { struct net *net = sock_net(skb->sk); struct xfrm_userpolicy_default *up = nlmsg_data(nlh); - u8 dirmask; + u8 dirmask = (1 << up->dirmask) & XFRM_POL_DEFAULT_MASK; u8 old_default = net->xfrm.policy_default; - if (up->dirmask >= XFRM_USERPOLICY_DIRMASK_MAX) - return -EINVAL; - - dirmask = (1 << up->dirmask) & XFRM_POL_DEFAULT_MASK; - net->xfrm.policy_default = (old_default & (0xff ^ dirmask)) | (up->action << up->dirmask);