selftests: mptcp: extend CFLAGS to keep options from environment

BugLink: https://bugs.launchpad.net/bugs/2111953

[ Upstream commit 23b3a7c4a7583eac9e3976355928a832c87caa0f ]

Package build environments like Fedora rpmbuild introduced hardening
options (e.g. -pie -Wl,-z,now) by passing a -spec option to CFLAGS
and LDFLAGS.

mptcp Makefile currently overrides CFLAGS but not LDFLAGS, which leads
to a mismatch and build failure, for example:
  make[1]: *** [../../lib.mk:222: tools/testing/selftests/net/mptcp/mptcp_sockopt] Error 1
  /usr/bin/ld: /tmp/ccqyMVdb.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIE
  /usr/bin/ld: failed to set dynamic section sizes: bad value
  collect2: error: ld returned 1 exit status

Fixes: cc937dad85ae ("selftests: centralize -D_GNU_SOURCE= to CFLAGS in lib.mk")
Signed-off-by: Jan Stancek <jstancek@redhat.com>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/7abc701da9df39c2d6cd15bc3cf9e6cee445cb96.1737621162.git.jstancek@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>

This commit is contained in:

Jan Stancek

2025-01-23 09:35:42 +01:00

committed by

Mehmet Basaran

parent 41bf654457

commit 924d2cb909

1 changed files with 1 additions and 1 deletions

									
										tools/testing/selftests/net/mptcp/Makefile
									
		+1
		-1
	
												View File
												
				@@ -2,7 +2,7 @@

				top_srcdir = ../../../../..

				CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)

				CFLAGS += -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)

				TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \

					      simult_flows.sh mptcp_sockopt.sh userspace_pm.sh