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

Pull networking fixes from David Miller:

 1) ARM64 JIT fixes for subprog handling from Daniel Borkmann.

 2) Various sparc64 JIT bug fixes (fused branch convergance, frame
    pointer usage detection logic, PSEODU call argument handling).

 3) Fix to use BH locking in nf_conncount, from Taehee Yoo.

 4) Fix race of TX skb freeing in ipheth driver, from Bernd Eckstein.

 5) Handle return value of TX NAPI completion properly in lan743x
    driver, from Bryan Whitehead.

 6) MAC filter deletion in i40e driver clears wrong state bit, from
    Lihong Yang.

 7) Fix use after free in rionet driver, from Pan Bian.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)
  s390/qeth: fix length check in SNMP processing
  net: hisilicon: remove unexpected free_netdev
  rapidio/rionet: do not free skb before reading its length
  i40e: fix kerneldoc for xsk methods
  ixgbe: recognize 1000BaseLX SFP modules as 1Gbps
  i40e: Fix deletion of MAC filters
  igb: fix uninitialized variables
  netfilter: nf_tables: deactivate expressions in rule replecement routine
  lan743x: Enable driver to work with LAN7431
  tipc: fix lockdep warning during node delete
  lan743x: fix return value for lan743x_tx_napi_poll
  net: via: via-velocity: fix spelling mistake "alignement" -> "alignment"
  qed: fix spelling mistake "attnetion" -> "attention"
  net: thunderx: fix NULL pointer dereference in nic_remove
  sctp: increase sk_wmem_alloc when head->truesize is increased
  firestream: fix spelling mistake: "Inititing" -> "Initializing"
  net: phy: add workaround for issue where PHY driver doesn't bind to the device
  usbnet: ipheth: fix potential recvmsg bug and recvmsg bug 2
  sparc: Adjust bpf JIT prologue for PSEUDO calls.
  bpf, doc: add entries of who looks over which jits
  ...

1 files changed, 8 insertions, 5 deletions

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 5302ee282409..ccee180dfb76 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -357,10 +357,9 @@ static void print_prog_plain(struct bpf_prog_info *info, int fd)
         if (!hash_empty(prog_table.table)) {
                 struct pinned_obj *obj;
 
-                printf("\n");
                 hash_for_each_possible(prog_table.table, obj, hash, info->id) {
                         if (obj->id == info->id)
-                                printf("\tpinned %s\n", obj->path);
+                                printf("\n\tpinned %s", obj->path);
                 }
         }
 
@@ -845,6 +844,7 @@ static int do_load(int argc, char **argv)
                         }
                         NEXT_ARG();
                 } else if (is_prefix(*argv, "map")) {
+                        void *new_map_replace;
                         char *endptr, *name;
                         int fd;
 
@@ -878,12 +878,15 @@ static int do_load(int argc, char **argv)
                         if (fd < 0)
                                 goto err_free_reuse_maps;
 
-                        map_replace = reallocarray(map_replace, old_map_fds + 1,
-                                                   sizeof(*map_replace));
-                        if (!map_replace) {
+                        new_map_replace = reallocarray(map_replace,
+                                                       old_map_fds + 1,
+                                                       sizeof(*map_replace));
+                        if (!new_map_replace) {
                                 p_err("mem alloc failed");
                                 goto err_free_reuse_maps;
                         }
+                        map_replace = new_map_replace;
+
                         map_replace[old_map_fds].idx = idx;
                         map_replace[old_map_fds].name = name;
                         map_replace[old_map_fds].fd = fd;