Patch "selftests: net/{lib,openvswitch}: extend CFLAGS to keep options from environment" has been added to the 6.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests: net/{lib,openvswitch}: extend CFLAGS to keep options from environment

to the 6.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-net-lib-openvswitch-extend-cflags-to-keep-.patch
and it can be found in the queue-6.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9bb38581a8f1c194459cde4c5f6c40db72786efb
Author: Jan Stancek <jstancek@xxxxxxxxxx>
Date:   Thu Jan 23 13:38:51 2025 +0100

    selftests: net/{lib,openvswitch}: extend CFLAGS to keep options from environment
    
    [ Upstream commit 9b06d5b956131bde535f5c045cf8c1ff6bfba76c ]
    
    Package build environments like Fedora rpmbuild introduced hardening
    options (e.g. -pie -Wl,-z,now) by passing a -spec option to CFLAGS
    and LDFLAGS.
    
    Some Makefiles currently override CFLAGS but not LDFLAGS, which leads
    to a mismatch and build failure, for example:
      /usr/bin/ld: /tmp/ccd2apay.o: relocation R_X86_64_32 against
        `.rodata.str1.1' 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
      make[1]: *** [../../lib.mk:222: tools/testing/selftests/net/lib/csum] Error 1
    
    openvswitch/Makefile CFLAGS currently do not appear to be used, but
    fix it anyway for the case when new tests are introduced in future.
    
    Fixes: 1d0dc857b5d8 ("selftests: drv-net: add checksum tests")
    Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>
    Acked-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
    Reviewed-by: Hangbin Liu <liuhangbin@xxxxxxxxx>
    Link: https://patch.msgid.link/3d173603ee258f419d0403363765c9f9494ff79a.1737635092.git.jstancek@xxxxxxxxxx
    Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/net/lib/Makefile b/tools/testing/selftests/net/lib/Makefile
index 18b9443454a9e..bc6b6762baf3e 100644
--- a/tools/testing/selftests/net/lib/Makefile
+++ b/tools/testing/selftests/net/lib/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g
+CFLAGS += -Wall -Wl,--no-as-needed -O2 -g
 CFLAGS += -I../../../../../usr/include/ $(KHDR_INCLUDES)
 # Additional include paths needed by kselftest.h
 CFLAGS += -I../../
diff --git a/tools/testing/selftests/net/openvswitch/Makefile b/tools/testing/selftests/net/openvswitch/Makefile
index 2f1508abc826b..3fd1da2ec07d5 100644
--- a/tools/testing/selftests/net/openvswitch/Makefile
+++ b/tools/testing/selftests/net/openvswitch/Makefile
@@ -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 := openvswitch.sh