Skip to contentSkip to conversation

test-filter-mirror: pass UNIX domain socket through fd

PATCH Superseded Jason Wang 2 participants 3 messages Jan 28, 2019 – Jan 29, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jason Wang

author
#0 lore raw

PATCH 1/1 test-filter-mirror: pass UNIX domain socket through fd

The tests tries to let qemu server mode to process the connection which turns out to be racy after commit 8258292e18c3 ("monitor: Remove "x-oob", offer capability "oob" unconditionally"). This is because the filter may try to mirror the packets before UNIX socket object is ready (connected was set to true) from the view of qemu. In this case the packet will be dropped silently.

Fixing this by passing pre-connected socket created by socketpair() to qemu through fd.

Cc Peter Maydell <[email protected]>
Cc Li Zhijian <[email protected]>
Cc Peter Xu <[email protected]>
Cc Dr. David Alan Gilbert <[email protected]>
Cc Zhang Chen <[email protected]>
Cc Markus Armbruster <[email protected]>
Cc Daniel P. Berrange <[email protected]>
---
 tests/test-filter-mirror.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
tests/test-filter-mirror.c +6 -12
index 7ab2aed8a0..3c3d1f8961 100644
@@ -21,10 +21,9 @@
 
 static void test_mirror(void)
 {
-    int send_sock[2], recv_sock;
+    int send_sock[2], recv_sock[2];
     uint32_t ret = 0, len = 0;
     char send_buf[] = "Hello! filter-mirror~";
-    char sock_path[] = "filter-mirror.XXXXXX";
     char *recv_buf;
     uint32_t size = sizeof(send_buf);
     size = htonl(size);
@@ -38,18 +37,15 @@ static void test_mirror(void)
     ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);
     g_assert_cmpint(ret, !=, -1);
 
-    ret = mkstemp(sock_path);
+    ret = socketpair(PF_UNIX, SOCK_STREAM, 0, recv_sock);
     g_assert_cmpint(ret, !=, -1);
 
     qts = qtest_initf(
         "-netdev socket,id=qtest-bn0,fd=%d "
         "-device %s,netdev=qtest-bn0,id=qtest-e0 "
-        "-chardev socket,id=mirror0,path=%s,server,nowait "
+        "-chardev socket,id=mirror0,fd=%d "
         "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 "
-        , send_sock[1], devstr, sock_path);
-
-    recv_sock = unix_connect(sock_path, NULL);
-    g_assert_cmpint(recv_sock, !=, -1);
+        , send_sock[1], devstr, recv_sock[1]);
 
     struct iovec iov[] = {
         {
@@ -67,18 +63,16 @@ static void test_mirror(void)
     g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
     close(send_sock[0]);
 
-    ret = qemu_recv(recv_sock, &len, sizeof(len), 0);
+    ret = qemu_recv(recv_sock[0], &len, sizeof(len), 0);
     g_assert_cmpint(ret, ==, sizeof(len));
     len = ntohl(len);
 
     g_assert_cmpint(len, ==, sizeof(send_buf));
     recv_buf = g_malloc(len);
-    ret = qemu_recv(recv_sock, recv_buf, len, 0);
+    ret = qemu_recv(recv_sock[0], recv_buf, len, 0);
     g_assert_cmpstr(recv_buf, ==, send_buf);
 
     g_free(recv_buf);
-    close(recv_sock);
-    unlink(sock_path);
     qtest_quit(qts);
 }
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 67 lines · Jason Wang

The tests tries to let qemu server mode to process the connection which turns out to be racy after commit 8258292e18c3 ("monitor: Remove "x-oob", offer capability "oob" unconditionally"). This is because the filter may try to mirror the packets before UNIX socket object is ready (connected was set to true) from the view of qemu. In this case the packet will be dropped silently.

Fixing this by passing pre-connected socket created by socketpair() to qemu through fd.

Cc Peter Maydell <[email protected]>
Cc Li Zhijian <[email protected]>
Cc Peter Xu <[email protected]>
Cc Dr. David Alan Gilbert <[email protected]>
Cc Zhang Chen <[email protected]>
Cc Markus Armbruster <[email protected]>
Cc Daniel P. Berrange <[email protected]>
---
 tests/test-filter-mirror.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
tests/test-filter-mirror.c +5 -9
index 7ab2aed8a0..3c3d1f8961 100644
@@ -21,10 +21,9 @@
 
 static void test_mirror(void)
 {
-    int send_sock[2], recv_sock;
+    int send_sock[2], recv_sock[2];
     uint32_t ret = 0, len = 0;
     char send_buf[] = "Hello! filter-mirror~";
-    char sock_path[] = "filter-mirror.XXXXXX";
     char *recv_buf;
     uint32_t size = sizeof(send_buf);
     size = htonl(size);
@@ -38,18 +37,15 @@ static void test_mirror(void)
     ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);
     g_assert_cmpint(ret, !=, -1);
 
-    ret = mkstemp(sock_path);
+    ret = socketpair(PF_UNIX, SOCK_STREAM, 0, recv_sock);
     g_assert_cmpint(ret, !=, -1);
 
     qts = qtest_initf(
         "-netdev socket,id=qtest-bn0,fd=%d "
         "-device %s,netdev=qtest-bn0,id=qtest-e0 "
-        "-chardev socket,id=mirror0,path=%s,server,nowait "
+        "-chardev socket,id=mirror0,fd=%d "
         "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 "
-        , send_sock[1], devstr, sock_path);
-
-    recv_sock = unix_connect(sock_path, NULL);
-    g_assert_cmpint(recv_sock, !=, -1);
+        , send_sock[1], devstr, recv_sock[1]);
 
     struct iovec iov[] = {
         {
@@ -67,18 +63,16 @@ static void test_mirror(void)
     g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
     close(send_sock[0]);
 
-    ret = qemu_recv(recv_sock, &len, sizeof(len), 0);
+    ret = qemu_recv(recv_sock[0], &len, sizeof(len), 0);
     g_assert_cmpint(ret, ==, sizeof(len));

tests/test-filter-mirror.c static void test_mirror(void) · line 80

Quoted 10 lines
tests/test-filter-mirror.c +1 -2
     len = ntohl(len);
 
     g_assert_cmpint(len, ==, sizeof(send_buf));
     recv_buf = g_malloc(len);
-    ret = qemu_recv(recv_sock, recv_buf, len, 0);
+    ret = qemu_recv(recv_sock[0], recv_buf, len, 0);
     g_assert_cmpstr(recv_buf, ==, send_buf);
 
     g_free(recv_buf);
-    close(recv_sock);

You're leaking recv_sock[0] and recv_sock[1] now. For that matter it seems send_sock[0] & send_sock[1] are already both leaked too.

tests/test-filter-mirror.c static void test_mirror(void) · line 77

Quoted 3 lines
tests/test-filter-mirror.c +0 -1
-    unlink(sock_path);
     qtest_quit(qts);
 }

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
author
#2 lore raw
Quoted 76 lines · Daniel P. Berrangé
Quoted 75 lines · Jason Wang

The tests tries to let qemu server mode to process the connection which turns out to be racy after commit 8258292e18c3 ("monitor: Remove "x-oob", offer capability "oob" unconditionally"). This is because the filter may try to mirror the packets before UNIX socket object is ready (connected was set to true) from the view of qemu. In this case the packet will be dropped silently.

Fixing this by passing pre-connected socket created by socketpair() to qemu through fd.

Cc Peter Maydell <[email protected]>
Cc Li Zhijian <[email protected]>
Cc Peter Xu <[email protected]>
Cc Dr. David Alan Gilbert <[email protected]>
Cc Zhang Chen <[email protected]>
Cc Markus Armbruster <[email protected]>
Cc Daniel P. Berrange <[email protected]>
---
  tests/test-filter-mirror.c | 18 ++++++------------
  1 file changed, 6 insertions(+), 12 deletions(-)
tests/test-filter-mirror.c +6 -10
index 7ab2aed8a0..3c3d1f8961 100644
@@ -21,10 +21,9 @@
 
  static void test_mirror(void)
  {
-    int send_sock[2], recv_sock;
+    int send_sock[2], recv_sock[2];
      uint32_t ret = 0, len = 0;
      char send_buf[] = "Hello! filter-mirror~";
-    char sock_path[] = "filter-mirror.XXXXXX";
      char *recv_buf;
      uint32_t size = sizeof(send_buf);
      size = htonl(size);
@@ -38,18 +37,15 @@ static void test_mirror(void)
      ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);
      g_assert_cmpint(ret, !=, -1);
 
-    ret = mkstemp(sock_path);
+    ret = socketpair(PF_UNIX, SOCK_STREAM, 0, recv_sock);
      g_assert_cmpint(ret, !=, -1);
 
      qts = qtest_initf(
          "-netdev socket,id=qtest-bn0,fd=%d "
          "-device %s,netdev=qtest-bn0,id=qtest-e0 "
-        "-chardev socket,id=mirror0,path=%s,server,nowait "
+        "-chardev socket,id=mirror0,fd=%d "
          "-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 "
-        , send_sock[1], devstr, sock_path);
-
-    recv_sock = unix_connect(sock_path, NULL);
-    g_assert_cmpint(recv_sock, !=, -1);
+        , send_sock[1], devstr, recv_sock[1]);
 
      struct iovec iov[] = {
          {
@@ -67,18 +63,16 @@ static void test_mirror(void)
      g_assert_cmpint(ret, ==, sizeof(send_buf) + sizeof(size));
      close(send_sock[0]);
 
-    ret = qemu_recv(recv_sock, &len, sizeof(len), 0);
+    ret = qemu_recv(recv_sock[0], &len, sizeof(len), 0);
      g_assert_cmpint(ret, ==, sizeof(len));
      len = ntohl(len);
 
      g_assert_cmpint(len, ==, sizeof(send_buf));
      recv_buf = g_malloc(len);
-    ret = qemu_recv(recv_sock, recv_buf, len, 0);
+    ret = qemu_recv(recv_sock[0], recv_buf, len, 0);
      g_assert_cmpstr(recv_buf, ==, send_buf);
 
Quoted 4 lines

tests/test-filter-mirror.c static void test_mirror(void) · line 80

Quoted 2 lines
tests/test-filter-mirror.c +0 -1
      g_free(recv_buf);
-    close(recv_sock);

You're leaking recv_sock[0] and recv_sock[1] now. For that matter it seems send_sock[0] & send_sock[1] are already both leaked too.

Will fix in V2.

Thanks

Quoted 5 lines

tests/test-filter-mirror.c static void test_mirror(void) · line 77

Quoted 3 lines
tests/test-filter-mirror.c +0 -1
-    unlink(sock_path);
      qtest_quit(qts);
  }

Regards,
Daniel