mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
Jan Beulich
6fba45ca3b
Our present approach is working fully behind the compiler's back. This
was found to not work with LTO. Employ ld's --wrap= option instead. Note
that while this makes the build work at least with new enough gcc (it
doesn't with gcc7, for example, due to tool chain side issues afaict),
according to my testing things still won't work when building the
fuzzing harness with afl-cc: While with the gcc7 tool chain I see afl-as
getting invoked, this does not happen with gcc13. Yet without using that
assembler wrapper the resulting binary will look uninstrumented to
afl-fuzz.
While checking the resulting binaries I noticed that we've gained uses
of snprintf() and strstr(), which only just so happen to not cause any
problems. Add a wrappers for them as well.
Since we don't have any actual uses of v{,sn}printf(), no definitions of
their wrappers appear (just yet). But I think we want
__wrap_{,sn}printf() to properly use __real_v{,sn}printf() right away,
which means we need delarations of the latter.
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
85 lines
2.3 KiB
Makefile
85 lines
2.3 KiB
Makefile
XEN_ROOT=$(CURDIR)/../../..
|
|
include $(XEN_ROOT)/tools/Rules.mk
|
|
|
|
.PHONY: x86-insn-fuzz-all
|
|
ifeq ($(CONFIG_X86_64),y)
|
|
x86-insn-fuzz-all: x86-insn-fuzzer.a fuzz-emul.o afl
|
|
else
|
|
x86-insn-fuzz-all:
|
|
endif
|
|
|
|
# Add libx86 to the build
|
|
%.c: $(XEN_ROOT)/xen/lib/x86/%.c FORCE
|
|
ln -nsf $< $@
|
|
|
|
x86_emulate: FORCE
|
|
mkdir -p $@
|
|
ln -sf $(XEN_ROOT)/xen/arch/x86/$@/*.[ch] $@/
|
|
|
|
x86_emulate/%.c: x86_emulate ;
|
|
x86_emulate/%.h: x86_emulate ;
|
|
|
|
%.c: $(XEN_ROOT)/tools/tests/x86_emulator/%.c FORCE
|
|
ln -nsf $< $@
|
|
%.h: $(XEN_ROOT)/tools/tests/x86_emulator/%.h FORCE
|
|
ln -nsf $< $@
|
|
|
|
CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -iquote .
|
|
cpuid.o: CFLAGS += -iquote $(XEN_ROOT)/xen/lib/x86
|
|
|
|
GCOV_FLAGS := --coverage
|
|
%-cov.o: %.c
|
|
$(CC) -c $(CFLAGS) $(GCOV_FLAGS) $< -o $@
|
|
|
|
OBJS := fuzz-emul.o x86-emulate.o
|
|
OBJS += x86_emulate/0f01.o x86_emulate/0fae.o x86_emulate/0fc7.o
|
|
OBJS += x86_emulate/decode.o x86_emulate/fpu.o
|
|
|
|
WRAPPED = $(shell sed -n 's,^ *WRAP(\([[:alnum:]_]*\));,\1,p' x86-emulate.h)
|
|
|
|
private.h := x86-emulate.h x86_emulate/x86_emulate.h x86_emulate/private.h
|
|
|
|
x86-emulate.h: x86_emulate/x86_emulate.h
|
|
x86-emulate.o x86-emulate-cov.o: x86_emulate/x86_emulate.c $(private.h)
|
|
fuzz-emul.o fuzz-emul-cov.o wrappers.o: x86-emulate.h
|
|
|
|
$(filter x86_emulate/%.o,$(OBJS)): x86_emulate/%.o: x86_emulate/%.c $(private.h)
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -c -o $@ $< $(APPEND_CFLAGS)
|
|
|
|
$(patsubst %.o,%-cov.o,$(filter x86_emulate/%.o,$(OBJS))): x86_emulate/%-cov.o: x86_emulate/%.c $(private.h)
|
|
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) $(GCOV_FLAGS) -c -o $@ $< $(APPEND_CFLAGS)
|
|
|
|
x86-insn-fuzzer.a: $(OBJS) cpuid.o
|
|
$(AR) rc $@ $^
|
|
|
|
afl-harness: afl-harness.o $(OBJS) cpuid.o wrappers.o
|
|
$(CC) $(CFLAGS) $(addprefix -Wl$(comma)--wrap=,$(WRAPPED)) $^ -o $@
|
|
|
|
afl-harness-cov: afl-harness-cov.o $(patsubst %.o,%-cov.o,$(OBJS)) cpuid.o wrappers.o
|
|
$(CC) $(CFLAGS) $(GCOV_FLAGS) $(addprefix -Wl$(comma)--wrap=,$(WRAPPED)) $^ -o $@
|
|
|
|
# Common targets
|
|
.PHONY: all
|
|
all: x86-insn-fuzz-all
|
|
|
|
.PHONY: distclean
|
|
distclean: clean
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
rm -f *.a *.o $(DEPS_RM) afl-harness afl-harness-cov *.gcda *.gcno *.gcov
|
|
rm -rf x86_emulate x86-emulate.c x86-emulate.h wrappers.c cpuid.c
|
|
|
|
.PHONY: install
|
|
install: all
|
|
|
|
.PHONY: uninstall
|
|
|
|
.PHONY: afl
|
|
afl: afl-harness
|
|
|
|
.PHONY: afl-cov
|
|
afl-cov: afl-harness-cov
|
|
|
|
-include $(DEPS_INCLUDE)
|