Skip to content

Commit

Permalink
net: xfrm: fix shift-out-of-bounds in xfrm_get_default
Browse files Browse the repository at this point in the history
Syzbot hit shift-out-of-bounds in xfrm_get_default. The problem was in
missing validation check for user data.

up->dirmask comes from user-space, so we need to check if this value
is less than XFRM_USERPOLICY_DIRMASK_MAX to avoid shift-out-of-bounds bugs.

Fixes: 2d151d3 ("xfrm: Add possibility to set the default to block if we have no policy")
Reported-and-tested-by: syzbot+b2be9dd8ca6f6c73ee2d@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
  • Loading branch information
Pavel Skripkin authored and Steffen Klassert committed Sep 9, 2021
1 parent 626bf91 commit 3c10ffd
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions net/xfrm/xfrm_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -2005,6 +2005,11 @@ static int xfrm_get_default(struct sk_buff *skb, struct nlmsghdr *nlh,
return -EMSGSIZE;
}

if (up->dirmask >= XFRM_USERPOLICY_DIRMASK_MAX) {
kfree_skb(r_skb);
return -EINVAL;
}

r_up = nlmsg_data(r_nlh);

r_up->action = ((net->xfrm.policy_default & (1 << up->dirmask)) >> up->dirmask);
Expand Down

0 comments on commit 3c10ffd

Please sign in to comment.