代码拉取完成,页面将自动刷新
同步操作将从 src-openEuler/gazelle 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
From fbd169eb504f5edc905f07f33785ba3df5812b4c Mon Sep 17 00:00:00 2001
From: li_yunqing <liyunqing@kylinos.cn>
Date: Thu, 14 Mar 2024 16:37:27 +0800
Subject: [PATCH] select timeout arguments check
---
src/lstack/api/lstack_epoll.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/lstack/api/lstack_epoll.c b/src/lstack/api/lstack_epoll.c
index 7dbef9d..c9d1f0c 100644
--- a/src/lstack/api/lstack_epoll.c
+++ b/src/lstack/api/lstack_epoll.c
@@ -927,13 +927,17 @@ static void fds_poll2select(struct pollfd *fds, nfds_t nfds, fd_set *readfds, fd
}
}
-static inline int timeval_to_ms(struct timeval *timeval)
+static inline int timeval_to_ms(struct timeval *timeval, int32_t *timeout)
{
- if (timeval == NULL) {
+ if (!timeval) {
+ *timeout = -1;
+ return 0;
+ }
+ if (unlikely((timeval->tv_sec < 0 || timeval->tv_usec < 0 || timeval->tv_usec >= 1000000))) {
return -1;
}
-
- return (timeval->tv_sec * 1000 + timeval->tv_usec / 1000);
+ *timeout = timeval->tv_sec * 1000 + timeval->tv_usec / 1000;
+ return 0;
}
static nfds_t fds_select2poll(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct pollfd *fds)
@@ -969,7 +973,11 @@ int lstack_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *exceptfd
/* Convert the select parameter to the poll parameter. */
struct pollfd fds[FD_SETSIZE] = { 0 };
nfds_t nfds = fds_select2poll(maxfd, readfds, writefds, exceptfds, fds);
- int timeout = timeval_to_ms(timeval);
+ int timeout = 0;
+ if (timeval_to_ms(timeval, &timeout)) {
+ LSTACK_LOG(ERR, LSTACK, "select input param timeout error.\n");
+ GAZELLE_RETURN(EINVAL);
+ }
int event_num = lstack_poll(fds, nfds, timeout);
--
2.33.0
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。