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

Pull networking fixes from David Miller:

 1) BPF verifier fixes from Daniel Borkmann.

 2) HNS driver fixes from Huazhong Tan.

 3) FDB only works for ethernet devices, reject attempts to install FDB
    rules for others. From Ido Schimmel.

 4) Fix spectre V1 in vhost, from Jason Wang.

 5) Don't pass on-stack object to irq_set_affinity_hint() in mvpp2
    driver, from Marc Zyngier.

 6) Fix mlx5e checksum handling when RXFCS is enabled, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (49 commits)
  openvswitch: Fix push/pop ethernet validation
  net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules
  bpf: test make sure to run unpriv test cases in test_verifier
  bpf: add various test cases to test_verifier
  bpf: don't set id on after map lookup with ptr_to_map_val return
  bpf: fix partial copy of map_ptr when dst is scalar
  libbpf: Fix compile error in libbpf_attach_type_by_name
  kselftests/bpf: use ping6 as the default ipv6 ping binary if it exists
  selftests: mlxsw: qos_mc_aware: Add a test for UC awareness
  selftests: mlxsw: qos_mc_aware: Tweak for min shaper
  mlxsw: spectrum: Set minimum shaper on MC TCs
  mlxsw: reg: QEEC: Add minimum shaper fields
  net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset()
  net: hns3: bugfix for rtnl_lock's range in the hclge_reset()
  net: hns3: bugfix for handling mailbox while the command queue reinitialized
  net: hns3: fix incorrect return value/type of some functions
  net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read
  net: hns3: bugfix for is_valid_csq_clean_head()
  net: hns3: remove unnecessary queue reset in the hns3_uninit_all_ring()
  net: hns3: bugfix for the initialization of command queue's spin lock
  ...

1 files changed, 12 insertions, 9 deletions

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 171a2c88e77d..1971ca325fb4 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -2852,10 +2852,6 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn
                 regs[BPF_REG_0].type = NOT_INIT;
         } else if (fn->ret_type == RET_PTR_TO_MAP_VALUE_OR_NULL ||
                    fn->ret_type == RET_PTR_TO_MAP_VALUE) {
-                if (fn->ret_type == RET_PTR_TO_MAP_VALUE)
-                        regs[BPF_REG_0].type = PTR_TO_MAP_VALUE;
-                else
-                        regs[BPF_REG_0].type = PTR_TO_MAP_VALUE_OR_NULL;
                 /* There is no offset yet applied, variable or fixed */
                 mark_reg_known_zero(env, regs, BPF_REG_0);
                 /* remember map_ptr, so that check_map_access()
@@ -2868,7 +2864,12 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn
                         return -EINVAL;
                 }
                 regs[BPF_REG_0].map_ptr = meta.map_ptr;
-                regs[BPF_REG_0].id = ++env->id_gen;
+                if (fn->ret_type == RET_PTR_TO_MAP_VALUE) {
+                        regs[BPF_REG_0].type = PTR_TO_MAP_VALUE;
+                } else {
+                        regs[BPF_REG_0].type = PTR_TO_MAP_VALUE_OR_NULL;
+                        regs[BPF_REG_0].id = ++env->id_gen;
+                }
         } else if (fn->ret_type == RET_PTR_TO_SOCKET_OR_NULL) {
                 int id = acquire_reference_state(env, insn_idx);
                 if (id < 0)
@@ -3046,7 +3047,7 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env,
                         dst_reg->umax_value = umax_ptr;
                         dst_reg->var_off = ptr_reg->var_off;
                         dst_reg->off = ptr_reg->off + smin_val;
-                        dst_reg->range = ptr_reg->range;
+                        dst_reg->raw = ptr_reg->raw;
                         break;
                 }
                 /* A new variable offset is created.  Note that off_reg->off
@@ -3076,10 +3077,11 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env,
                 }
                 dst_reg->var_off = tnum_add(ptr_reg->var_off, off_reg->var_off);
                 dst_reg->off = ptr_reg->off;
+                dst_reg->raw = ptr_reg->raw;
                 if (reg_is_pkt_pointer(ptr_reg)) {
                         dst_reg->id = ++env->id_gen;
                         /* something was added to pkt_ptr, set range to zero */
-                        dst_reg->range = 0;
+                        dst_reg->raw = 0;
                 }
                 break;
         case BPF_SUB:
@@ -3108,7 +3110,7 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env,
                         dst_reg->var_off = ptr_reg->var_off;
                         dst_reg->id = ptr_reg->id;
                         dst_reg->off = ptr_reg->off - smin_val;
-                        dst_reg->range = ptr_reg->range;
+                        dst_reg->raw = ptr_reg->raw;
                         break;
                 }
                 /* A new variable offset is created.  If the subtrahend is known
@@ -3134,11 +3136,12 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env,
                 }
                 dst_reg->var_off = tnum_sub(ptr_reg->var_off, off_reg->var_off);
                 dst_reg->off = ptr_reg->off;
+                dst_reg->raw = ptr_reg->raw;
                 if (reg_is_pkt_pointer(ptr_reg)) {
                         dst_reg->id = ++env->id_gen;
                         /* something was added to pkt_ptr, set range to zero */
                         if (smin_val < 0)
-                                dst_reg->range = 0;
+                                dst_reg->raw = 0;
                 }
                 break;
         case BPF_AND: