Skip to contentSkip to conversation

selftests: vsock: avoid mktemp -u for Unix socket paths

PATCH In review CaoRuichuang 2 participants 2 messages Apr 5 – Apr 9

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

PATCH 1/1 selftests: vsock: avoid mktemp -u for Unix socket paths

The namespace tests create temporary Unix socket paths with mktemp -u and then hand them to socat. That only prints an unused pathname and leaves a race before the socket is created.

Create a private temporary directory with mktemp -d and place the Unix socket inside it instead. This keeps the path unique without relying on mktemp -u for filesystem socket names.

---
 tools/testing/selftests/vsock/vmtest.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
tools/testing/selftests/vsock/vmtest.sh +9 -4
index 86e338886..91e0037d2 100755
@@ -718,6 +718,7 @@ test_ns_diff_global_host_connect_to_global_vm_ok() {
 	local pids pid pidfile
 	local ns0 ns1 port
 	declare -a pids
+	local unixdir
 	local unixfile
 	ns0="global0"
 	ns1="global1"
@@ -736,7 +737,8 @@ test_ns_diff_global_host_connect_to_global_vm_ok() {
 	oops_before=$(vm_dmesg_oops_count "${ns0}")
 	warn_before=$(vm_dmesg_warn_count "${ns0}")
 
-	unixfile=$(mktemp -u /tmp/XXXX.sock)
+	unixdir=$(mktemp -d /tmp/vsock_vmtest_XXXXXX)
+	unixfile="${unixdir}/sock"
 	ip netns exec "${ns1}" \
 		socat TCP-LISTEN:"${TEST_HOST_PORT}",fork \
 			UNIX-CONNECT:"${unixfile}" &
@@ -758,6 +760,7 @@ test_ns_diff_global_host_connect_to_global_vm_ok() {
 
 	terminate_pids "${pids[@]}"
 	terminate_pidfiles "${pidfile}"
+	rm -rf "${unixdir}"
 
 	if [[ "${rc}" -ne 0 ]] || [[ "${dmesg_rc}" -ne 0 ]]; then
 		return "${KSFT_FAIL}"
@@ -814,6 +817,7 @@ test_ns_diff_global_vm_connect_to_global_host_ok() {
 	local ns0="global0"
 	local ns1="global1"
 	local port=12345
+	local unixdir
 	local unixfile
 	local dmesg_rc
 	local pidfile
@@ -826,7 +830,8 @@ test_ns_diff_global_vm_connect_to_global_host_ok() {
 
 	log_host "Setup socat bridge from ns ${ns0} to ns ${ns1} over port ${port}"
 
-	unixfile=$(mktemp -u /tmp/XXXX.sock)
+	unixdir=$(mktemp -d /tmp/vsock_vmtest_XXXXXX)
+	unixfile="${unixdir}/sock"
 
 	ip netns exec "${ns0}" \
 		socat TCP-LISTEN:"${port}" UNIX-CONNECT:"${unixfile}" &
@@ -845,7 +850,7 @@ test_ns_diff_global_vm_connect_to_global_host_ok() {
 	if ! vm_start "${pidfile}" "${ns0}"; then
 		log_host "failed to start vm (cid=${cid}, ns=${ns0})"
 		terminate_pids "${pids[@]}"
-		rm -f "${unixfile}"
+		rm -rf "${unixdir}"
 		return "${KSFT_FAIL}"
 	fi
 
@@ -862,7 +867,7 @@ test_ns_diff_global_vm_connect_to_global_host_ok() {
 
 	terminate_pidfiles "${pidfile}"
 	terminate_pids "${pids[@]}"
-	rm -f "${unixfile}"
+	rm -rf "${unixdir}"
 
 	if [[ "${rc}" -ne 0 ]] || [[ "${dmesg_rc}" -ne 0 ]]; then
 		return "${KSFT_FAIL}"
Signature · 1 line
2.39.5 (Apple Git-154)
reviewer
#1 lore raw
Quoted 9 lines · CaoRuichuang

The namespace tests create temporary Unix socket paths with mktemp -u and then hand them to socat. That only prints an unused pathname and leaves a race before the socket is created.

Create a private temporary directory with mktemp -d and place the Unix socket inside it instead. This keeps the path unique without relying on mktemp -u for filesystem socket names.

This patch was sent twice in quick succession.

Please don't do that.
Instead, please allow 24h between posts of updated patches to netdev. And please version patches, like this:

Subject: [PATCH v2] ...

The process is intended to help reviewers.

For more information, please see:
https://docs.kernel.org/process/maintainer-netdev.html