Patch "selftests/landlock: Fix net_test build with old libc" has been added to the 6.7-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

    selftests/landlock: Fix net_test build with old libc

to the 6.7-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-landlock-fix-net_test-build-with-old-libc.patch
and it can be found in the queue-6.7 subdirectory.

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



commit 4320f193dece95d3923f3a1b95180ef3318fa9cf
Author: Hu Yadi <hu.yadi@xxxxxxx>
Date:   Tue Jan 23 14:26:21 2024 +0800

    selftests/landlock: Fix net_test build with old libc
    
    [ Upstream commit 116099ed345c932a8ae4a0d884a8f6cc54fd5fed ]
    
    One issue comes up while building selftest/landlock/net_test on my side
    (gcc 7.3/glibc-2.28/kernel-4.19).
    
    net_test.c: In function ‘set_service’:
    net_test.c:91:45: warning: implicit declaration of function ‘gettid’; [-Wimplicit-function-declaration]
        "_selftests-landlock-net-tid%d-index%d", gettid(),
                                                 ^~~~~~
                                                 getgid
    net_test.c:(.text+0x4e0): undefined reference to `gettid'
    
    Signed-off-by: Hu Yadi <hu.yadi@xxxxxxx>
    Suggested-by: Jiao <jiaoxupo@xxxxxxx>
    Reviewed-by: Berlin <berlin@xxxxxxx>
    Fixes: a549d055a22e ("selftests/landlock: Add network tests")
    Link: https://lore.kernel.org/r/20240123062621.25082-1-hu.yadi@xxxxxxx
    [mic: Cosmetic fixes]
    Signed-off-by: Mickaël Salaün <mic@xxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c
index 929e21c4db05..e07267acbc9a 100644
--- a/tools/testing/selftests/landlock/net_test.c
+++ b/tools/testing/selftests/landlock/net_test.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
+#include <sys/syscall.h>
 #include <sys/un.h>
 
 #include "common.h"
@@ -54,6 +55,11 @@ struct service_fixture {
 	};
 };
 
+static pid_t sys_gettid(void)
+{
+	return syscall(__NR_gettid);
+}
+
 static int set_service(struct service_fixture *const srv,
 		       const struct protocol_variant prot,
 		       const unsigned short index)
@@ -88,7 +94,7 @@ static int set_service(struct service_fixture *const srv,
 	case AF_UNIX:
 		srv->unix_addr.sun_family = prot.domain;
 		sprintf(srv->unix_addr.sun_path,
-			"_selftests-landlock-net-tid%d-index%d", gettid(),
+			"_selftests-landlock-net-tid%d-index%d", sys_gettid(),
 			index);
 		srv->unix_addr_len = SUN_LEN(&srv->unix_addr);
 		srv->unix_addr.sun_path[0] = '\0';




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux