xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: xfrm: fix shift-out-of-bounce

Browse Source 
[ Upstream commit 5d8dbb7fb82b8661c16d496644b931c0e2e3a12e ]

We need to check up->dirmask to avoid shift-out-of-bounce bug,
since up->dirmask comes from userspace.

Also, added XFRM_USERPOLICY_DIRMASK_MAX constant to uapi to inform
user-space that up->dirmask has maximum possible value

Fixes: 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy")
Reported-and-tested-by: syzbot+9cd5837a045bbee5b810@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pavel Skripkin
2021-07-28 19:38:18 +03:00
committed by Greg Kroah-Hartman
parent 5b7f84b1f9
commit ab610ee1d1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/uapi/linux/xfrm.h
View File

@@ -521,6 +521,7 @@ struct xfrm_user_offload {
#define XFRM_OFFLOAD_INBOUND 2 #define XFRM_OFFLOAD_INBOUND 2
struct xfrm_userpolicy_default { struct xfrm_userpolicy_default {
#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8)
__u8 dirmask; __u8 dirmask;
__u8 action; __u8 action;
}; };

7
net/xfrm/xfrm_user.c
View File

@@ -1919,9 +1919,14 @@ static int xfrm_set_default(struct sk_buff *skb, struct nlmsghdr *nlh,
{ {
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
struct xfrm_userpolicy_default *up = nlmsg_data(nlh); struct xfrm_userpolicy_default *up = nlmsg_data(nlh);
u8 dirmask = (1 << up->dirmask) & XFRM_POL_DEFAULT_MASK; u8 dirmask;
u8 old_default = net->xfrm.policy_default; 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)) net->xfrm.policy_default = (old_default & (0xff ^ dirmask))
| (up->action << up->dirmask); | (up->action << up->dirmask);