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

Alexei Starovoitov says:

====================
pull-request: bpf 2019-10-12

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

The main changes are:

1) a bunch of small fixes. Nothing critical.
====================

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

4 files changed, 9 insertions, 5 deletions

diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
index 6cbeea7b4bf1..8547ecbdc61f 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
@@ -195,7 +195,7 @@ static void run_test(int cgroup_fd)
 
         if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,
                                       (void *)&server_fd)))
-                goto close_bpf_object;
+                goto close_server_fd;
 
         pthread_mutex_lock(&server_started_mtx);
         pthread_cond_wait(&server_started, &server_started_mtx);
diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
index a82da555b1b0..f4cd60d6fba2 100644
--- a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
@@ -260,13 +260,14 @@ void test_tcp_rtt(void)
 
         if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,
                                       (void *)&server_fd)))
-                goto close_cgroup_fd;
+                goto close_server_fd;
 
         pthread_mutex_lock(&server_started_mtx);
         pthread_cond_wait(&server_started, &server_started_mtx);
         pthread_mutex_unlock(&server_started_mtx);
 
         CHECK_FAIL(run_test(cgroup_fd, server_fd));
+close_server_fd:
         close(server_fd);
 close_cgroup_fd:
         close(cgroup_fd);
diff --git a/tools/testing/selftests/bpf/test_flow_dissector.sh b/tools/testing/selftests/bpf/test_flow_dissector.sh
index d23d4da66b83..e2d06191bd35 100755
--- a/tools/testing/selftests/bpf/test_flow_dissector.sh
+++ b/tools/testing/selftests/bpf/test_flow_dissector.sh
@@ -63,6 +63,9 @@ fi
 
 # Setup
 tc qdisc add dev lo ingress
+echo 0 > /proc/sys/net/ipv4/conf/default/rp_filter
+echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter
+echo 0 > /proc/sys/net/ipv4/conf/lo/rp_filter
 
 echo "Testing IPv4..."
 # Drops all IP/UDP packets coming from port 9
diff --git a/tools/testing/selftests/bpf/test_lwt_ip_encap.sh b/tools/testing/selftests/bpf/test_lwt_ip_encap.sh
index acf7a74f97cd..59ea56945e6c 100755
--- a/tools/testing/selftests/bpf/test_lwt_ip_encap.sh
+++ b/tools/testing/selftests/bpf/test_lwt_ip_encap.sh
@@ -314,15 +314,15 @@ test_gso()
         command -v nc >/dev/null 2>&1 || \
                 { echo >&2 "nc is not available: skipping TSO tests"; return; }
 
-        # listen on IPv*_DST, capture TCP into $TMPFILE
+        # listen on port 9000, capture TCP into $TMPFILE
         if [ "${PROTO}" == "IPv4" ] ; then
                 IP_DST=${IPv4_DST}
                 ip netns exec ${NS3} bash -c \
-                        "nc -4 -l -s ${IPv4_DST} -p 9000 > ${TMPFILE} &"
+                        "nc -4 -l -p 9000 > ${TMPFILE} &"
         elif [ "${PROTO}" == "IPv6" ] ; then
                 IP_DST=${IPv6_DST}
                 ip netns exec ${NS3} bash -c \
-                        "nc -6 -l -s ${IPv6_DST} -p 9000 > ${TMPFILE} &"
+                        "nc -6 -l -p 9000 > ${TMPFILE} &"
                 RET=$?
         else
                 echo "    test_gso: unknown PROTO: ${PROTO}"