diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:23:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:23:00 +0000 |
| commit | 803b3a091c225d48395508a8f9ffa6e08cbddc5b (patch) | |
| tree | a3168c9e7da8991c423b5978aacf90c3c2b135c1 /tests/helpers | |
| parent | Releasing progress-linux version 2.40-8~progress7.99u1. (diff) | |
| download | util-linux-803b3a091c225d48395508a8f9ffa6e08cbddc5b.tar.xz util-linux-803b3a091c225d48395508a8f9ffa6e08cbddc5b.zip | |
Merging upstream version 2.40.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/helpers')
| -rw-r--r-- | tests/helpers/test_mkfds.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c index 39427ba..4b138c2 100644 --- a/tests/helpers/test_mkfds.c +++ b/tests/helpers/test_mkfds.c @@ -3200,6 +3200,25 @@ static int send_diag_request(int diagsd, void *req, size_t req_size) return 0; } +static int recv_diag_request(int diagsd) +{ + __attribute__((aligned(sizeof(void *)))) uint8_t buf[8192]; + const struct nlmsghdr *h; + int r = recvfrom(diagsd, buf, sizeof(buf), 0, NULL, NULL);; + if (r < 0) + return errno; + + h = (void *)buf; + if (!NLMSG_OK(h, (size_t)r)) + return -1; + + if (h->nlmsg_type == NLMSG_ERROR) { + struct nlmsgerr *e = (struct nlmsgerr *)NLMSG_DATA(h); + return - e->error; + } + return 0; +} + static void *make_sockdiag(const struct factory *factory, struct fdesc fdescs[], int argc, char ** argv) { @@ -3243,6 +3262,16 @@ static void *make_sockdiag(const struct factory *factory, struct fdesc fdescs[], err(EXIT_FAILURE, "failed in sendmsg()"); } + e = recv_diag_request(diagsd); + if (e != 0) { + close (diagsd); + if (e == ENOENT) + err(EXIT_ENOENT, "failed in recvfrom()"); + if (e > 0) + err(EXIT_FAILURE, "failed in recvfrom()"); + if (e < 0) + errx(EXIT_FAILURE, "failed in recvfrom() => -1"); + } if (diagsd != fdescs[0].fd) { if (dup2(diagsd, fdescs[0].fd) < 0) { |