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

Pull networking fixes from David Miller:
 "The iwlwifi firmware compat fix is in here as well as some other
  stuff:

  1) Fix request socket leak introduced by BPF deadlock fix, from Eric
     Dumazet.

  2) Fix VLAN handling with TXQs in mac80211, from Johannes Berg.

  3) Missing __qdisc_drop conversions in prio and qfq schedulers, from
     Gao Feng.

  4) Use after free in netlink nlk groups handling, from Xin Long.

  5) Handle MTU update properly in ipv6 gre tunnels, from Xin Long.

  6) Fix leak of ipv6 fib tables on netns teardown, from Sabrina Dubroca
     with follow-on fix from Eric Dumazet.

  7) Need RCU and preemption disabled during generic XDP data patch,
     from John Fastabend"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
  bpf: make error reporting in bpf_warn_invalid_xdp_action more clear
  Revert "mdio_bus: Remove unneeded gpiod NULL check"
  bpf: devmap, use cond_resched instead of cpu_relax
  bpf: add support for sockmap detach programs
  net: rcu lock and preempt disable missing around generic xdp
  bpf: don't select potentially stale ri->map from buggy xdp progs
  net: tulip: Constify tulip_tbl
  net: ethernet: ti: netcp_core: no need in netif_napi_del
  davicom: Display proper debug level up to 6
  net: phy: sfp: rename dt properties to match the binding
  dt-binding: net: sfp binding documentation
  dt-bindings: add SFF vendor prefix
  dt-bindings: net: don't confuse with generic PHY property
  ip6_tunnel: fix setting hop_limit value for ipv6 tunnel
  ip_tunnel: fix setting ttl and tos value in collect_md mode
  ipv6: fix typo in fib6_net_exit()
  tcp: fix a request socket leak
  sctp: fix missing wake ups in some situations
  netfilter: xt_hashlimit: fix build error caused by 64bit division
  netfilter: xt_hashlimit: alloc hashtable with right size
  ...

1 files changed, 50 insertions, 1 deletions

diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index 4acc772a28c0..fe3a443a1102 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -558,7 +558,7 @@ static void test_sockmap(int tasks, void *data)
                 }
         }
 
-        /* Test attaching bad fds */
+        /* Test attaching/detaching bad fds */
         err = bpf_prog_attach(-1, fd, BPF_SK_SKB_STREAM_PARSER, 0);
         if (!err) {
                 printf("Failed invalid parser prog attach\n");
@@ -571,6 +571,30 @@ static void test_sockmap(int tasks, void *data)
                 goto out_sockmap;
         }
 
+        err = bpf_prog_attach(-1, fd, __MAX_BPF_ATTACH_TYPE, 0);
+        if (!err) {
+                printf("Failed unknown prog attach\n");
+                goto out_sockmap;
+        }
+
+        err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_PARSER);
+        if (err) {
+                printf("Failed empty parser prog detach\n");
+                goto out_sockmap;
+        }
+
+        err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_VERDICT);
+        if (err) {
+                printf("Failed empty verdict prog detach\n");
+                goto out_sockmap;
+        }
+
+        err = bpf_prog_detach(fd, __MAX_BPF_ATTACH_TYPE);
+        if (!err) {
+                printf("Detach invalid prog successful\n");
+                goto out_sockmap;
+        }
+
         /* Load SK_SKB program and Attach */
         err = bpf_prog_load(SOCKMAP_PARSE_PROG,
                             BPF_PROG_TYPE_SK_SKB, &obj, &parse_prog);
@@ -643,6 +667,13 @@ static void test_sockmap(int tasks, void *data)
                 goto out_sockmap;
         }
 
+        err = bpf_prog_attach(verdict_prog, map_fd_rx,
+                              __MAX_BPF_ATTACH_TYPE, 0);
+        if (!err) {
+                printf("Attached unknown bpf prog\n");
+                goto out_sockmap;
+        }
+
         /* Test map update elem afterwards fd lives in fd and map_fd */
         for (i = 0; i < 6; i++) {
                 err = bpf_map_update_elem(map_fd_rx, &i, &sfd[i], BPF_ANY);
@@ -809,6 +840,24 @@ static void test_sockmap(int tasks, void *data)
                 assert(status == 0);
         }
 
+        err = bpf_prog_detach(map_fd_rx, __MAX_BPF_ATTACH_TYPE);
+        if (!err) {
+                printf("Detached an invalid prog type.\n");
+                goto out_sockmap;
+        }
+
+        err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_PARSER);
+        if (err) {
+                printf("Failed parser prog detach\n");
+                goto out_sockmap;
+        }
+
+        err = bpf_prog_detach(map_fd_rx, BPF_SK_SKB_STREAM_VERDICT);
+        if (err) {
+                printf("Failed parser prog detach\n");
+                goto out_sockmap;
+        }
+
         /* Test map close sockets */
         for (i = 0; i < 6; i++)
                 close(sfd[i]);