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

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

Browse Source 
This reverts commit ab610ee1d1 which is
5d8dbb7fb82b8661c16d496644b931c0e2e3a12e commit upstream.

It breaks the Android kernel ABI and if this really needs to be added to
Android, it must come back in a format in the future that does not break
the abi.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1843039a406d0e39cdbde7f1da9be30fb1cbcd6a
This commit is contained in:
Greg Kroah-Hartman
2022-06-24 10:02:10 +02:00
parent f7160ab103
commit e21944a82a
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -520,7 +520,6 @@ 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

@@ -1906,14 +1906,9 @@ 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; u8 dirmask = (1 << up->dirmask) & XFRM_POL_DEFAULT_MASK;
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);