From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
To: dev@dpdk.org
Cc: andrew.rybchenko@oktetlabs.ru, Jakub Grajciar <jgrajcia@cisco.com>
Subject: [dpdk-dev] [PATCH v2] net/memif: fix abstract socket addr_len
Date: Fri, 23 Jul 2021 11:18:57 +0200 [thread overview]
Message-ID: <20210723091857.9760-2-nathan.skrzypczak@gmail.com> (raw)
In-Reply-To: <20210617162233.54296-1-nathan.skrzypczak@gmail.com>
This fixes using abstract sockets with memifs.
we were not passing the exact addr_len, which
requires zeroing the remaining sun_path and
doesn't appear well in other utilities (e.g.
lsof -U)
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
---
drivers/net/memif/memif_socket.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 5b373738e6..f58ff4c0cb 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -866,6 +866,7 @@ memif_socket_create(char *key, uint8_t listener, bool is_abstract)
{
struct memif_socket *sock;
struct sockaddr_un un = { 0 };
+ uint32_t sunlen;
int sockfd;
int ret;
int on = 1;
@@ -890,7 +891,11 @@ memif_socket_create(char *key, uint8_t listener, bool is_abstract)
/* abstract address */
un.sun_path[0] = '\0';
strlcpy(un.sun_path + 1, sock->filename, MEMIF_SOCKET_UN_SIZE - 1);
+ sunlen = RTE_MIN(1 + strlen(sock->filename),
+ MEMIF_SOCKET_UN_SIZE) +
+ sizeof(un) - sizeof(un.sun_path);
} else {
+ sunlen = sizeof(un);
strlcpy(un.sun_path, sock->filename, MEMIF_SOCKET_UN_SIZE);
}
@@ -899,7 +904,7 @@ memif_socket_create(char *key, uint8_t listener, bool is_abstract)
if (ret < 0)
goto error;
- ret = bind(sockfd, (struct sockaddr *)&un, sizeof(un));
+ ret = bind(sockfd, (struct sockaddr *)&un, sunlen);
if (ret < 0)
goto error;
@@ -1061,6 +1066,7 @@ memif_connect_client(struct rte_eth_dev *dev)
{
int sockfd;
int ret;
+ uint32_t sunlen;
struct sockaddr_un sun = { 0 };
struct pmd_internals *pmd = dev->data->dev_private;
@@ -1075,16 +1081,19 @@ memif_connect_client(struct rte_eth_dev *dev)
}
sun.sun_family = AF_UNIX;
+ sunlen = sizeof(struct sockaddr_un);
if (pmd->flags & ETH_MEMIF_FLAG_SOCKET_ABSTRACT) {
/* abstract address */
sun.sun_path[0] = '\0';
strlcpy(sun.sun_path + 1, pmd->socket_filename, MEMIF_SOCKET_UN_SIZE - 1);
+ sunlen = RTE_MIN(strlen(pmd->socket_filename) + 1,
+ MEMIF_SOCKET_UN_SIZE) +
+ sizeof(sun) - sizeof(sun.sun_path);
} else {
strlcpy(sun.sun_path, pmd->socket_filename, MEMIF_SOCKET_UN_SIZE);
}
- ret = connect(sockfd, (struct sockaddr *)&sun,
- sizeof(struct sockaddr_un));
+ ret = connect(sockfd, (struct sockaddr *)&sun, sunlen);
if (ret < 0) {
MIF_LOG(ERR, "Failed to connect socket: %s.", pmd->socket_filename);
goto error;
--
2.30.2
next prev parent reply other threads:[~2021-07-26 11:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 16:22 [dpdk-dev] [PATCH] " Nathan Skrzypczak
2021-07-01 15:01 ` Andrew Rybchenko
2021-07-23 9:18 ` Nathan Skrzypczak [this message]
2021-07-28 11:10 ` [dpdk-dev] [PATCH v2] " Jakub Grajciar -X (jgrajcia - PANTHEON TECH SRO at Cisco)
2021-07-30 11:24 ` Thomas Monjalon
2021-07-30 12:53 ` Nathan Skrzypczak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723091857.9760-2-nathan.skrzypczak@gmail.com \
--to=nathan.skrzypczak@gmail.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=jgrajcia@cisco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).