Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2019-07-03

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix the interpreter to properly handle BPF_ALU32 | BPF_ARSH
   on BE architectures, from Jiong.

2) Fix several bugs in the x32 BPF JIT for handling shifts by 0,
   from Luke and Xi.

3) Fix NULL pointer deref in btf_type_is_resolve_source_only(),
   from Stanislav.

4) Properly handle the check that forwarding is enabled on the device
   in bpf_ipv6_fib_lookup() helper code, from Anton.

5) Fix UAPI bpf_prog_info fields alignment for archs that have 16 bit
   alignment such as m68k, from Baruch.

6) Fix kernel hanging in unregister_netdevice loop while unregistering
   device bound to XDP socket, from Ilya.

7) Properly terminate tail update in xskq_produce_flush_desc(), from Nathan.

8) Fix broken always_inline handling in test_lwt_seg6local, from Jiri.

9) Fix bpftool to use correct argument in cgroup errors, from Jakub.

10) Fix detaching dummy prog in XDP redirect sample code, from Prashant.

11) Add Jonathan to AF_XDP reviewers, from Björn.
====================

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

1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index cad09858a5f2..546ebee39e2a 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -1928,8 +1928,8 @@ static int btf_array_resolve(struct btf_verifier_env *env,
         /* Check array->index_type */
         index_type_id = array->index_type;
         index_type = btf_type_by_id(btf, index_type_id);
-        if (btf_type_is_resolve_source_only(index_type) ||
-            btf_type_nosize_or_null(index_type)) {
+        if (btf_type_nosize_or_null(index_type) ||
+            btf_type_is_resolve_source_only(index_type)) {
                 btf_verifier_log_type(env, v->t, "Invalid index");
                 return -EINVAL;
         }
@@ -1948,8 +1948,8 @@ static int btf_array_resolve(struct btf_verifier_env *env,
         /* Check array->type */
         elem_type_id = array->type;
         elem_type = btf_type_by_id(btf, elem_type_id);
-        if (btf_type_is_resolve_source_only(elem_type) ||
-            btf_type_nosize_or_null(elem_type)) {
+        if (btf_type_nosize_or_null(elem_type) ||
+            btf_type_is_resolve_source_only(elem_type)) {
                 btf_verifier_log_type(env, v->t,
                                       "Invalid elem");
                 return -EINVAL;
@@ -2170,8 +2170,8 @@ static int btf_struct_resolve(struct btf_verifier_env *env,
                 const struct btf_type *member_type = btf_type_by_id(env->btf,
                                                                 member_type_id);
 
-                if (btf_type_is_resolve_source_only(member_type) ||
-                    btf_type_nosize_or_null(member_type)) {
+                if (btf_type_nosize_or_null(member_type) ||
+                    btf_type_is_resolve_source_only(member_type)) {
                         btf_verifier_log_member(env, v->t, member,
                                                 "Invalid member");
                         return -EINVAL;