| Message ID | 20210723091857.9760-2-nathan.skrzypczak@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Thomas Monjalon |
| Headers | show |
| Series | [v2] net/memif: fix abstract socket addr_len | expand |
| Context | Check | Description |
|---|---|---|
| ci/iol-mellanox-Performance | success | Performance Testing PASS |
| ci/iol-testing | success | Testing PASS |
| ci/iol-abi-testing | success | Testing PASS |
| ci/iol-intel-Performance | success | Performance Testing PASS |
| ci/iol-intel-Functional | success | Functional Testing PASS |
| ci/checkpatch | success | coding style OK |
> -----Original Message----- > From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com> > Sent: Friday, July 23, 2021 11:19 AM > To: dev@dpdk.org > Cc: andrew.rybchenko@oktetlabs.ru; Jakub Grajciar -X (jgrajcia - PANTHEON > TECH SRO at Cisco) <jgrajcia@cisco.com> > Subject: [PATCH v2] net/memif: fix abstract socket addr_len > > 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> Looks ok to me. Reviewed-by: Jakub Grajciar <jgrajcia@cisco.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> > > Looks ok to me. > > Reviewed-by: Jakub Grajciar <jgrajcia@cisco.com> Applied, thanks.
Thanks ! Le ven. 30 juil. 2021 à 13:23, Thomas Monjalon <thomas@monjalon.net> a écrit : > > > 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> > > > > Looks ok to me. > > > > Reviewed-by: Jakub Grajciar <jgrajcia@cisco.com> > > Applied, thanks. > > >
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;
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(-)