From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90C12A00E6 for ; Mon, 8 Jul 2019 18:06:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D3F53256; Mon, 8 Jul 2019 18:06:10 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 4D4D7324D for ; Mon, 8 Jul 2019 18:06:08 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id y8so3799740plr.12 for ; Mon, 08 Jul 2019 09:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KOO1RnIy/pE6mih/C76sAadXz0KJiXGUVQPw5ouVJs4=; b=odTHSgHEnallFSu5s6VAxsCl8eAVh5tifWxdBuE4Vx/dMwVQ+1J0S8fw/Y+iv5skq+ fExHeSF90TuUIB0G/7pdFNejA07CJRzc9eL0yP+3IjYSuKdgnR3JdPEItz6DfrP0a11k yBrmZi3CXL10AtOCdya5MUHUsoPHXhfJdnlolAcW9Xlc9vjFJo62EBfaPaz+nJeP0WiV cSXVq1DuaxnpTM/M+8MMowqHBTCV5IGbYOJ8/splfpKtX2PZnfalvyZ+k6BwtO/dX0mq vHpQ3mb5ZNidFlJ7EWO1/swfBAqnX78nD7VifIQruM3OosVFnxpS29WthE7XKN83o5zg C7zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KOO1RnIy/pE6mih/C76sAadXz0KJiXGUVQPw5ouVJs4=; b=e+OEvcsTKZHEbiFYPEfklpz7YVbufFtfM4NWEwmo3IfD5DzqtA6gbpJd16UMfKrM3W FN/5Iuu/WauaKFqiHw3hcBLqhEviMS/UUFcGKfd5oiVFWUb9kepCebTlRThL95If0b/V LX0XGv1FKRh+/OPr4igRZb92+vt53h+fcsGBZ4ApmKkSuXn/jTlFJf5Ryy1JhxXNcwAJ XGx60BQy9xR40fvMTvsm8PRVh67825GzlD/Vs6S7zbp7UrzmSeAZUqgH2kUkyUv9MCGo V4obFpuVdcgxx2y+n0ez1ZyGRmWbabG7L7o8xH7lKw2+nPWitIskhF7v3vTmtpsbjIrc YNAQ== X-Gm-Message-State: APjAAAXenX+CLxIJLrXIy+UPkOPQANcpG7ICev51ng1tf48oeKqgXU9u 7NE3haBoOlCpGKWemMBTXwytC8iDLXc= X-Google-Smtp-Source: APXvYqwk9WSt0WSztZncyYo1NAnLnHAXr7xmiq2R/88bh36LbgWKKuO+28WKPY8RE5RgOp49Hm4pdQ== X-Received: by 2002:a17:902:a40c:: with SMTP id p12mr26046782plq.146.1562601967358; Mon, 08 Jul 2019 09:06:07 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id p187sm11766031pfg.89.2019.07.08.09.06.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 09:06:06 -0700 (PDT) From: Stephen Hemminger To: jgrajcia@cisco.com Cc: dev@dpdk.org, Stephen Hemminger Date: Mon, 8 Jul 2019 09:06:00 -0700 Message-Id: <20190708160600.25939-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC] net/memif: allow for full key size in socket name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The key size for memif is 256 but the unix domain socket structure has space for 100 bytes. Change it to use a larger buffer and not hard code the keysize everywhere. Not sure what purpose of socket is anyway since there is no code which connects to it in the current tree anyway? Signed-off-by: Stephen Hemminger --- Patch is RFC since not tested and I don't use memif so not going to go further. drivers/net/memif/memif_socket.c | 30 +++++++++++++++++++----------- drivers/net/memif/memif_socket.h | 4 +++- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c index 01a935f87c9f..fb69015694ba 100644 --- a/drivers/net/memif/memif_socket.c +++ b/drivers/net/memif/memif_socket.c @@ -860,11 +860,16 @@ memif_listener_handler(void *arg) rte_free(cc); } +#define MEMIF_SOCKET_UN_SIZE \ + (offsetof(struct sockaddr_un, sun_path) + MEMIF_SOCKET_KEY_LEN) + static struct memif_socket * -memif_socket_create(struct pmd_internals *pmd, char *key, uint8_t listener) +memif_socket_create(struct pmd_internals *pmd, + const char *key, uint8_t listener) { struct memif_socket *sock; - struct sockaddr_un un; + struct sockaddr_un *un; + char un_buf[MEMIF_SOCKET_UN_SIZE]; int sockfd; int ret; int on = 1; @@ -876,23 +881,25 @@ memif_socket_create(struct pmd_internals *pmd, char *key, uint8_t listener) } sock->listener = listener; - rte_memcpy(sock->filename, key, 256); + strlcpy(sock->filename, key, MEMIF_SOCKET_KEY_LEN); TAILQ_INIT(&sock->dev_queue); if (listener != 0) { + sockfd = socket(AF_UNIX, SOCK_SEQPACKET, 0); if (sockfd < 0) goto error; - un.sun_family = AF_UNIX; - memcpy(un.sun_path, sock->filename, - sizeof(un.sun_path) - 1); + memset(un_buf, 0, sizeof(un_buf)); + un = (struct sockaddr_un *) un_buf; + un->sun_family = AF_UNIX; + strlcpy(un->sun_path, sock->filename, MEMIF_SOCKET_KEY_LEN); ret = setsockopt(sockfd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)); if (ret < 0) goto error; - ret = bind(sockfd, (struct sockaddr *)&un, sizeof(un)); + ret = bind(sockfd, (struct sockaddr *)un, MEMIF_SOCKET_UN_SIZE); if (ret < 0) goto error; ret = listen(sockfd, 1); @@ -928,9 +935,10 @@ static struct rte_hash * memif_create_socket_hash(void) { struct rte_hash_parameters params = { 0 }; + params.name = MEMIF_SOCKET_HASH_NAME; params.entries = 256; - params.key_len = 256; + params.key_len = MEMIF_SOCKET_KEY_LEN;; params.hash_func = rte_jhash; params.hash_func_init_val = 0; return rte_hash_create(¶ms); @@ -945,7 +953,7 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename) struct pmd_internals *tmp_pmd; struct rte_hash *hash; int ret; - char key[256]; + char key[MEMIF_SOCKET_KEY_LEN]; hash = rte_hash_find_existing(MEMIF_SOCKET_HASH_NAME); if (hash == NULL) { @@ -956,8 +964,8 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename) } } - memset(key, 0, 256); - rte_memcpy(key, socket_filename, strlen(socket_filename)); + memset(key, 0, MEMIF_SOCKET_KEY_LEN); + strlcpy(key, socket_filename, MEMIF_SOCKET_KEY_LEN); ret = rte_hash_lookup_data(hash, key, (void **)&socket); if (ret < 0) { socket = memif_socket_create(pmd, key, diff --git a/drivers/net/memif/memif_socket.h b/drivers/net/memif/memif_socket.h index db293e200961..9f40f8d138bb 100644 --- a/drivers/net/memif/memif_socket.h +++ b/drivers/net/memif/memif_socket.h @@ -79,9 +79,11 @@ struct memif_socket_dev_list_elt { }; #define MEMIF_SOCKET_HASH_NAME "memif-sh" +#define MEMIF_SOCKET_KEY_LEN 256 + struct memif_socket { struct rte_intr_handle intr_handle; /**< interrupt handle */ - char filename[256]; /**< socket filename */ + char filename[MEMIF_SOCKET_KEY_LEN]; /**< socket filename */ TAILQ_HEAD(, memif_socket_dev_list_elt) dev_queue; /**< Queue of devices using this socket */ -- 2.20.1