Skip to contentSkip to conversation

selftests: net: af_unix: Fix a build error of unix_connect.c.

PATCH Applied Kuniyuki Iwashima 2 participants 2 messages Jul 20, 2022 – Jul 21, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selftests: net: af_unix: Fix a build error of unix_connect.c.

This patch fixes a build error reported in the link. [0]

unix_connect.c: In function ‘unix_connect_test’:
unix_connect.c:115:55: error: expected identifier before ‘(’ token

   #define offsetof(type, member) ((size_t)&((type *)0)->(member))
                                                       ^
  unix_connect.c:128:12: note: in expansion of macro ‘offsetof’
    addrlen = offsetof(struct sockaddr_un, sun_path) + variant->len;
              ^~~~~~~~

We can fix this by removing () around member, but checkpatch will complain about it, and the root cause of the build failure is that I followed the warning and fixed this in the v2 -> v3 change of the blamed commit. [1]

CHECK: Macro argument 'member' may be better as '(member)' to avoid precedence issues #33: FILE: tools/testing/selftests/net/af_unix/unix_connect.c:115:
+#define offsetof(type, member) ((size_t)&((type *)0)->member)

To avoid this warning, let's use offsetof() defined in stddef.h instead.

[0]: https://lore.kernel.org/linux-mm/[email protected]/
[1]: https://lore.kernel.org/netdev/[email protected]/

Fixes e95ab1d85289 ("selftests: net: af_unix: Test connect() with different netns.")

---
v2:
* Use offsetof() in stddef.h instead of defining it. (Jakub Kicinski)

v1: https://lore.kernel.org/netdev/[email protected]/

---
 tools/testing/selftests/net/af_unix/unix_connect.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
tools/testing/selftests/net/af_unix/unix_connect.c +1 -2
index 157e44ef7f37..d799fd8f5c7c 100644
@@ -3,6 +3,7 @@
 #define _GNU_SOURCE
 #include <sched.h>
 
+#include <stddef.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -112,8 +113,6 @@ FIXTURE_TEARDOWN(unix_connect)
 		remove("test");
 }
 
-#define offsetof(type, member) ((size_t)&((type *)0)->(member))
-
 TEST_F(unix_connect, test)
 {
 	socklen_t addrlen;
Signature · 1 line
2.30.2
#1 lore raw
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 11 lines · On Tue, 19 Jul 2022 17:57:50 -0700 you wrote:

This patch fixes a build error reported in the link. [0]

unix_connect.c: In function ‘unix_connect_test’:
unix_connect.c:115:55: error: expected identifier before ‘(’ token

   #define offsetof(type, member) ((size_t)&((type *)0)->(member))
                                                       ^
  unix_connect.c:128:12: note: in expansion of macro ‘offsetof’
    addrlen = offsetof(struct sockaddr_un, sun_path) + variant->len;
              ^~~~~~~~

[...]

Here is the summary with links:
- [v2,net-next] selftests: net: af_unix: Fix a build error of unix_connect.c.

    https://git.kernel.org/netdev/net-next/c/f12b86c0d606

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html