Merge branch 'timers/vdso' into timers/core

so the hyper-v clocksource update can be applied.

1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 96c8928b468b..5b30f8baaf02 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1573,6 +1573,8 @@ bpf_prog_load_check_attach_type(enum bpf_prog_type prog_type,
                 case BPF_CGROUP_INET6_CONNECT:
                 case BPF_CGROUP_UDP4_SENDMSG:
                 case BPF_CGROUP_UDP6_SENDMSG:
+                case BPF_CGROUP_UDP4_RECVMSG:
+                case BPF_CGROUP_UDP6_RECVMSG:
                         return 0;
                 default:
                         return -EINVAL;
@@ -1867,6 +1869,8 @@ static int bpf_prog_attach(const union bpf_attr *attr)
         case BPF_CGROUP_INET6_CONNECT:
         case BPF_CGROUP_UDP4_SENDMSG:
         case BPF_CGROUP_UDP6_SENDMSG:
+        case BPF_CGROUP_UDP4_RECVMSG:
+        case BPF_CGROUP_UDP6_RECVMSG:
                 ptype = BPF_PROG_TYPE_CGROUP_SOCK_ADDR;
                 break;
         case BPF_CGROUP_SOCK_OPS:
@@ -1952,6 +1956,8 @@ static int bpf_prog_detach(const union bpf_attr *attr)
         case BPF_CGROUP_INET6_CONNECT:
         case BPF_CGROUP_UDP4_SENDMSG:
         case BPF_CGROUP_UDP6_SENDMSG:
+        case BPF_CGROUP_UDP4_RECVMSG:
+        case BPF_CGROUP_UDP6_RECVMSG:
                 ptype = BPF_PROG_TYPE_CGROUP_SOCK_ADDR;
                 break;
         case BPF_CGROUP_SOCK_OPS:
@@ -2003,6 +2009,8 @@ static int bpf_prog_query(const union bpf_attr *attr,
         case BPF_CGROUP_INET6_CONNECT:
         case BPF_CGROUP_UDP4_SENDMSG:
         case BPF_CGROUP_UDP6_SENDMSG:
+        case BPF_CGROUP_UDP4_RECVMSG:
+        case BPF_CGROUP_UDP6_RECVMSG:
         case BPF_CGROUP_SOCK_OPS:
         case BPF_CGROUP_DEVICE:
         case BPF_CGROUP_SYSCTL: