Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 9 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 4c53cbd3329d..7713cf39795a 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1,13 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
  */
 #include <linux/bpf.h>
 #include <linux/bpf_trace.h>
@@ -1584,6 +1576,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;
@@ -1892,6 +1886,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:
@@ -1977,6 +1973,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:
@@ -2028,6 +2026,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: