7 files changed, 28 insertions, 10 deletions

diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index 66ae15f27c70..db1a91dfa702 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -279,6 +279,7 @@ $(obj)/%.o: $(src)/%.c
                 -Wno-gnu-variable-sized-type-not-at-end \
                 -Wno-address-of-packed-member -Wno-tautological-compare \
                 -Wno-unknown-warning-option $(CLANG_ARCH_ARGS) \
+                -I$(srctree)/samples/bpf/ -include asm_goto_workaround.h \
                 -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf $(LLC_FLAGS) -filetype=obj -o $@
 ifeq ($(DWARF2BTF),y)
         $(BTF_PAHOLE) -J $@
diff --git a/samples/bpf/asm_goto_workaround.h b/samples/bpf/asm_goto_workaround.h
new file mode 100644
index 000000000000..5cd7c1d1a5d5
--- /dev/null
+++ b/samples/bpf/asm_goto_workaround.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2019 Facebook */
+#ifndef __ASM_GOTO_WORKAROUND_H
+#define __ASM_GOTO_WORKAROUND_H
+
+/* this will bring in asm_volatile_goto macro definition
+ * if enabled by compiler and config options.
+ */
+#include <linux/types.h>
+
+#ifdef asm_volatile_goto
+#undef asm_volatile_goto
+#define asm_volatile_goto(x...) asm volatile("invalid use of asm_volatile_goto")
+#endif
+
+#endif
diff --git a/samples/bpf/test_cgrp2_attach2.c b/samples/bpf/test_cgrp2_attach2.c
index d7b68ef5ba79..0bb6507256b7 100644
--- a/samples/bpf/test_cgrp2_attach2.c
+++ b/samples/bpf/test_cgrp2_attach2.c
@@ -77,7 +77,7 @@ static int test_foo_bar(void)
 
         /* Create cgroup /foo, get fd, and join it */
         foo = create_and_get_cgroup(FOO);
-        if (!foo)
+        if (foo < 0)
                 goto err;
 
         if (join_cgroup(FOO))
@@ -94,7 +94,7 @@ static int test_foo_bar(void)
 
         /* Create cgroup /foo/bar, get fd, and join it */
         bar = create_and_get_cgroup(BAR);
-        if (!bar)
+        if (bar < 0)
                 goto err;
 
         if (join_cgroup(BAR))
@@ -298,19 +298,19 @@ static int test_multiprog(void)
                 goto err;
 
         cg1 = create_and_get_cgroup("/cg1");
-        if (!cg1)
+        if (cg1 < 0)
                 goto err;
         cg2 = create_and_get_cgroup("/cg1/cg2");
-        if (!cg2)
+        if (cg2 < 0)
                 goto err;
         cg3 = create_and_get_cgroup("/cg1/cg2/cg3");
-        if (!cg3)
+        if (cg3 < 0)
                 goto err;
         cg4 = create_and_get_cgroup("/cg1/cg2/cg3/cg4");
-        if (!cg4)
+        if (cg4 < 0)
                 goto err;
         cg5 = create_and_get_cgroup("/cg1/cg2/cg3/cg4/cg5");
-        if (!cg5)
+        if (cg5 < 0)
                 goto err;
 
         if (join_cgroup("/cg1/cg2/cg3/cg4/cg5"))
diff --git a/samples/bpf/test_current_task_under_cgroup_user.c b/samples/bpf/test_current_task_under_cgroup_user.c
index 2259f997a26c..f082d6ac59f0 100644
--- a/samples/bpf/test_current_task_under_cgroup_user.c
+++ b/samples/bpf/test_current_task_under_cgroup_user.c
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
 
         cg2 = create_and_get_cgroup(CGROUP_PATH);
 
-        if (!cg2)
+        if (cg2 < 0)
                 goto err;
 
         if (bpf_map_update_elem(map_fd[0], &idx, &cg2, BPF_ANY)) {
diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
index 0a197f86ac43..8bfda95c77ad 100644
--- a/samples/bpf/xdp1_user.c
+++ b/samples/bpf/xdp1_user.c
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
                 return 1;
         }
 
-        ifindex = if_nametoindex(argv[1]);
+        ifindex = if_nametoindex(argv[optind]);
         if (!ifindex) {
                 perror("if_nametoindex");
                 return 1;
diff --git a/samples/mei/mei-amt-version.c b/samples/mei/mei-amt-version.c
index 33e67bd1dc34..32234481ad7d 100644
--- a/samples/mei/mei-amt-version.c
+++ b/samples/mei/mei-amt-version.c
@@ -117,7 +117,7 @@ static bool mei_init(struct mei *me, const uuid_le *guid,
 
         me->verbose = verbose;
 
-        me->fd = open("/dev/mei", O_RDWR);
+        me->fd = open("/dev/mei0", O_RDWR);
         if (me->fd == -1) {
                 mei_err(me, "Cannot establish a handle to the Intel MEI driver\n");
                 goto err;
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
index 4920903c8009..fb43a814d4c0 100644
--- a/samples/seccomp/Makefile
+++ b/samples/seccomp/Makefile
@@ -34,6 +34,7 @@ HOSTCFLAGS_bpf-direct.o += $(MFLAG)
 HOSTCFLAGS_dropper.o += $(MFLAG)
 HOSTCFLAGS_bpf-helper.o += $(MFLAG)
 HOSTCFLAGS_bpf-fancy.o += $(MFLAG)
+HOSTCFLAGS_user-trap.o += $(MFLAG)
 HOSTLDLIBS_bpf-direct += $(MFLAG)
 HOSTLDLIBS_bpf-fancy += $(MFLAG)
 HOSTLDLIBS_dropper += $(MFLAG)