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

2 files changed, 5 insertions, 4 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index ec7c552af76b..797a99c7493e 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -577,12 +577,12 @@ static int map_create(union bpf_attr *attr)
         err = bpf_map_new_fd(map, f_flags);
         if (err < 0) {
                 /* failed to allocate fd.
-                 * bpf_map_put() is needed because the above
+                 * bpf_map_put_with_uref() is needed because the above
                  * bpf_map_alloc_id() has published the map
                  * to the userspace and the userspace may
                  * have refcnt-ed it through BPF_MAP_GET_FD_BY_ID.
                  */
-                bpf_map_put(map);
+                bpf_map_put_with_uref(map);
                 return err;
         }
 
@@ -2025,7 +2025,7 @@ static int bpf_map_get_fd_by_id(const union bpf_attr *attr)
 
         fd = bpf_map_new_fd(map, f_flags);
         if (fd < 0)
-                bpf_map_put(map);
+                bpf_map_put_with_uref(map);
 
         return fd;
 }
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 1b9496c41383..ebc3b264aa4d 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -7559,7 +7559,8 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)
                         u32 off_reg;
 
                         aux = &env->insn_aux_data[i + delta];
-                        if (!aux->alu_state)
+                        if (!aux->alu_state ||
+                            aux->alu_state == BPF_ALU_NON_POINTER)
                                 continue;
 
                         isneg = aux->alu_state & BPF_ALU_NEG_VALUE;