You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/11/04 18:30:04 UTC
[incubator-nuttx] 04/06: rpmgs_socket: set RPMSG_SOCKET_NAME_SIZE
to 16 for handing prefix
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 00ef4fca51f6f0e6a954487a1658749a8b5387f3
Author: ligd <li...@xiaomi.com>
AuthorDate: Fri Oct 15 22:39:17 2021 +0800
rpmgs_socket: set RPMSG_SOCKET_NAME_SIZE to 16 for handing prefix
Signed-off-by: ligd <li...@xiaomi.com>
---
include/netpacket/rpmsg.h | 2 +-
net/rpmsg/rpmsg_sockif.c | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/netpacket/rpmsg.h b/include/netpacket/rpmsg.h
index d422b21..46c93c0 100644
--- a/include/netpacket/rpmsg.h
+++ b/include/netpacket/rpmsg.h
@@ -32,7 +32,7 @@
****************************************************************************/
#define RPMSG_SOCKET_CPU_SIZE 16
-#define RPMSG_SOCKET_NAME_SIZE 32
+#define RPMSG_SOCKET_NAME_SIZE 16
/****************************************************************************
* Public Type Definitions
diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c
index 5c4fe43..f32b637 100644
--- a/net/rpmsg/rpmsg_sockif.c
+++ b/net/rpmsg/rpmsg_sockif.c
@@ -52,6 +52,9 @@
#define RPMSG_SOCKET_CMD_DATA 2
#define RPMSG_SOCKET_NAME_PREFIX "rpmsg-socket"
+static_assert(RPMSG_SOCKET_NAME_SIZE + 13 <= RPMSG_NAME_SIZE,
+ "socket name size should NOT bigger then RPMSG_NAME_SIZE");
+
/****************************************************************************
* Private Types
****************************************************************************/
@@ -407,7 +410,7 @@ static void rpmsg_socket_device_created(FAR struct rpmsg_device *rdev,
FAR void *priv)
{
FAR struct rpmsg_socket_conn_s *conn = priv;
- char buf[RPMSG_SOCKET_NAME_SIZE];
+ char buf[RPMSG_NAME_SIZE];
if (conn->ept.rdev)
{
@@ -457,7 +460,7 @@ static void rpmsg_socket_ns_bind(FAR struct rpmsg_device *rdev,
FAR struct rpmsg_socket_conn_s *server = priv;
FAR struct rpmsg_socket_conn_s *tmp;
FAR struct rpmsg_socket_conn_s *new;
- char buf[RPMSG_SOCKET_NAME_SIZE];
+ char buf[RPMSG_NAME_SIZE];
int cnt = 0;
int ret;