Thus wrote Florian Schmaus via B4 Relay ([email protected]):
> From: Florian Schmaus <[email protected]> > When kselftests are built and installed using "make install" or > integrated into other build systems (such as Yocto's "devtool > modify"), the source tree might be owned by a non-root developer user. > Because the installation scripts use "rsync -a", which implies -o and > -g, the installed test binaries and scripts are explicitly assigned > the UID/GID of the source tree owner instead of the user running the > install command. This results in UID leaks into the root filesystem. > Fix this by explicitly adding --no-owner --no-group to all rsync > invocations across the selftests Makefiles so that the installed files > are owned by the installing user (typically root). > Signed-off-by: Florian Schmaus <[email protected]> > --- > tools/testing/selftests/bpf/Makefile | 6 +++--- > tools/testing/selftests/futex/Makefile | 2 +- > tools/testing/selftests/lib.mk | 8 ++++---- > tools/testing/selftests/sparc64/Makefile | 2 +- > 4 files changed, 9 insertions(+), 9 deletions(-) > diff --git a/tools/testing/selftests/bpf/Makefile > b/tools/testing/selftests/bpf/Makefile > index b642ee489ea6..1ff923eab76b 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -781,7 +781,7 @@ $(TRUNNER_LIB_OBJS): > $(TRUNNER_OUTPUT)/%.o:$(TOOLSDIR)/lib/%.c > $(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT) > ifneq ($2:$(OUTPUT),:$(shell pwd)) > $$(call msg,EXT-COPY,$(TRUNNER_BINARY),$(TRUNNER_EXTRA_FILES)) > - $(Q)rsync -aq $(if $(PERMISSIVE),--ignore-missing-args) $$^ > $(TRUNNER_OUTPUT)/ > + $(Q)rsync -aq --no-owner --no-group $(if > $(PERMISSIVE),--ignore-missing-args) $$^ $(TRUNNER_OUTPUT)/ > endif > # some X.test.o files have runtime dependencies on Y.bpf.o files > @@ -1048,7 +1048,7 @@ EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) > \ > ifneq ($(PERMISSIVE),) > override define INSTALL_SINGLE_RULE > $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) > - $(if $(INSTALL_LIST),rsync -a --copy-unsafe-links --ignore-missing-args > $(INSTALL_LIST) $(INSTALL_PATH)/) > + $(if $(INSTALL_LIST),rsync -a --no-owner --no-group --copy-unsafe-links > --ignore-missing-args $(INSTALL_LIST) $(INSTALL_PATH)/) > endef > endif > @@ -1057,7 +1057,7 @@ override define INSTALL_RULE > $(DEFAULT_INSTALL_RULE) > @for DIR in $(TEST_INST_SUBDIRS); do \ > mkdir -p $(INSTALL_PATH)/$$DIR; \ > - rsync -a $(if $(PERMISSIVE),--ignore-missing-args) \ > + rsync -a --no-owner --no-group $(if > $(PERMISSIVE),--ignore-missing-args) \ > $(OUTPUT)/$$DIR/*.bpf.o \ > $(INSTALL_PATH)/$$DIR; \ > done > diff --git a/tools/testing/selftests/futex/Makefile > b/tools/testing/selftests/futex/Makefile > index 78ab2cd111f6..c59f40b837e8 100644 > --- a/tools/testing/selftests/futex/Makefile > +++ b/tools/testing/selftests/futex/Makefile > @@ -11,7 +11,7 @@ all: > mkdir $$BUILD_TARGET -p; \ > $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\ > if [ -e $$DIR/$(TEST_PROGS) ]; then \ > - rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \ > + rsync -a --no-owner --no-group $$DIR/$(TEST_PROGS) > $$BUILD_TARGET/; \ > fi \ > done > diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk > index f02cc8a2e4ae..aedcee1c04c6 100644 > --- a/tools/testing/selftests/lib.mk > +++ b/tools/testing/selftests/lib.mk > @@ -122,14 +122,14 @@ define INSTALL_INCLUDES > fi; \ > relative_files="$$relative_files > $$relative_dir/$$entry_name"; \ > done; \ > - cd $(SRC_PATH) && rsync -aR $$relative_files $(OBJ_PATH)/ \ > + cd $(SRC_PATH) && rsync -aR --no-owner --no-group > $$relative_files $(OBJ_PATH)/ \ > ) > endef > run_tests: all > ifdef building_out_of_srctree > @if [ > "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)$(TEST_GEN_MODS_DIR)" != > "X" ]; then \ > - rsync -aq --copy-unsafe-links $(TEST_PROGS) > $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(TEST_GEN_MODS_DIR) $(OUTPUT); \ > + rsync -aq --no-owner --no-group --copy-unsafe-links > $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(TEST_GEN_MODS_DIR) > $(OUTPUT); \ > fi > @$(INSTALL_INCLUDES) > @if [ "X$(TEST_PROGS)" != "X" ]; then \ > @@ -150,12 +150,12 @@ clean_mods_dir: > define INSTALL_SINGLE_RULE > $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) > - $(if $(INSTALL_LIST),rsync -a --copy-unsafe-links $(INSTALL_LIST) > $(INSTALL_PATH)/) > + $(if $(INSTALL_LIST),rsync -a --no-owner --no-group --copy-unsafe-links > $(INSTALL_LIST) $(INSTALL_PATH)/) > endef > define INSTALL_MODS_RULE > $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)/$(INSTALL_LIST)) > - $(if $(INSTALL_LIST),rsync -a --copy-unsafe-links $(INSTALL_LIST)/*.ko > $(INSTALL_PATH)/$(INSTALL_LIST)) > + $(if $(INSTALL_LIST),rsync -a --no-owner --no-group --copy-unsafe-links > $(INSTALL_LIST)/*.ko $(INSTALL_PATH)/$(INSTALL_LIST)) > endef > define INSTALL_RULE > diff --git a/tools/testing/selftests/sparc64/Makefile > b/tools/testing/selftests/sparc64/Makefile > index 88f7be76f962..001b68e6354b 100644 > --- a/tools/testing/selftests/sparc64/Makefile > +++ b/tools/testing/selftests/sparc64/Makefile > @@ -25,7 +25,7 @@ all: > #SUBDIR test prog name should be in the form: SUBDIR_test.sh \ > TEST=$$DIR"_test.sh"; \ > if [ -e $$DIR/$$TEST ]; then \ > - rsync -a $$DIR/$$TEST $$BUILD_TARGET/; \ > + rsync -a --no-owner --no-group $$DIR/$$TEST > $$BUILD_TARGET/; \ > fi \ > done > --- > base-commit: 3b029c035b34bbc693405ddf759f0e9b920c27f1 > change-id: 20260715-kselftest-rsync-right-a57bf0e85190 > Best regards, > -- > Florian Schmaus <[email protected]> Looks good to me. Reviewed-by: Martin Kaiser <[email protected]>
