fix(net): 建立网络 fd 失效值契约,杜绝零初始化误判
根因:静态 fd 零初始化为 0,而 0 是合法 socket 句柄;判据用 >=0 会把"未初始化"误判成"有效",关闭时误伤他人 fd。本次把该修复 契约化、机械化,而不是再补一个点。 - 新增 net_fd.h 定义唯一失效值 NET_FD_INVALID(-1),全仓零依赖复用 - fd 判据只用 ==/!= NET_FD_INVALID,禁 >=0/<0/数值形态/if(fd) - 网络层内部用 NET_FD_IN_RANGE 做范围校验,上界不外泄 - 主机 fake 改 0 基并跟踪已分配 fd,补冷启动回归(变异测试可捕获) - 新增 net-handle 静态门禁(钩子 53)+ 契约文档 + 审计 + 最小加固 验证:net-handle 487 文件 0 违规;8 个主机套件全绿;Keil 0 错误 0 警告; 审计 3 确认/5 疑似/35 安全,无第二处生产误判。
This commit is contained in:
@@ -62,6 +62,10 @@ int g_lfi_debug_count;
|
||||
|
||||
/* ===================== 可控 socket 层 ===================== */
|
||||
|
||||
/* 假 fd 域与生产对齐(契约 C5/C6/C7):0 基 + 已分配集合;
|
||||
* net_close 对越界 / 未分配 fd 必须失败(返回 NET_FD_INVALID 并把 errno 置 BADF)。 */
|
||||
#define LFI_FAKE_MAX_FD 8
|
||||
|
||||
typedef struct {
|
||||
int socket_rc;
|
||||
int bind_rc;
|
||||
@@ -100,11 +104,13 @@ typedef struct {
|
||||
} lfi_net_t;
|
||||
|
||||
static lfi_net_t g_net;
|
||||
static int lfi_fd_used[LFI_FAKE_MAX_FD]; /* 1 = 该 fd 已由假 net_socket/accept 分配 */
|
||||
|
||||
static void net_reset(void)
|
||||
{
|
||||
(void)memset(&g_net, 0, sizeof(g_net));
|
||||
g_net.socket_rc = 3;
|
||||
(void)memset(lfi_fd_used, 0, sizeof(lfi_fd_used));
|
||||
g_net.socket_rc = 0; /* 契约 C5:首个成功 fd 是 0 */
|
||||
g_net.bind_rc = 0;
|
||||
g_net.listen_rc = 0;
|
||||
g_net.getsock_rc = 0;
|
||||
@@ -131,6 +137,10 @@ int net_socket(int domain, int type)
|
||||
g_net.socket_calls++;
|
||||
g_net.last_domain = domain;
|
||||
g_net.last_type = type;
|
||||
/* 测试代码:裸字面量判据属"假对象域校验"语义(契约 C6),非生产判据 */
|
||||
if (g_net.socket_rc >= 0 && g_net.socket_rc < LFI_FAKE_MAX_FD) {
|
||||
lfi_fd_used[g_net.socket_rc] = 1;
|
||||
}
|
||||
return g_net.socket_rc;
|
||||
}
|
||||
|
||||
@@ -154,8 +164,12 @@ int net_listen(int sockfd)
|
||||
|
||||
int net_close(int sockfd)
|
||||
{
|
||||
(void)sockfd;
|
||||
g_net.close_calls++;
|
||||
/* 测试代码:假对象域校验(契约 C6)——越界 / 未分配一律失败 */
|
||||
if (sockfd < 0 || sockfd >= LFI_FAKE_MAX_FD || lfi_fd_used[sockfd] == 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
lfi_fd_used[sockfd] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -275,18 +289,18 @@ static void tc_listen(void)
|
||||
(g_lfi_error_count == 1), "TC-LFTINET-003 a listen failure also closes the socket and logs it");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
CHECK((lftpd_inet_listen(21) == 3) && (g_net.last_domain == NET_AF_INET) &&
|
||||
CHECK((lftpd_inet_listen(21) == 0) && (g_net.last_domain == NET_AF_INET) &&
|
||||
(g_net.last_type == NET_SOCK_STREAM) &&
|
||||
(g_net.last_bind_port_net == net_htons(21u)) && (g_net.listen_calls == 1),
|
||||
"TC-LFTINET-004 a stream listener whose port went through htons (sin_port is network order)");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.getsock_rc = -1;
|
||||
CHECK((lftpd_inet_get_socket_port(3) == -1) && (g_lfi_error_count == 1),
|
||||
CHECK((lftpd_inet_get_socket_port(0) == -1) && (g_lfi_error_count == 1),
|
||||
"TC-LFTINET-005 a failing getsockname returns -1 (never report a stale port as the result)");
|
||||
net_reset(); logs_clear();
|
||||
g_net.getsock_port_net = net_htons(8888u);
|
||||
CHECK(lftpd_inet_get_socket_port(3) == 8888,
|
||||
CHECK(lftpd_inet_get_socket_port(0) == 8888,
|
||||
"TC-LFTINET-006 the port comes back through ntohs into host order");
|
||||
}
|
||||
|
||||
@@ -296,14 +310,14 @@ static void tc_accept(void)
|
||||
{
|
||||
printf("-- TC-LFTINET-010..012 / 020..022 accept --\n");
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = 9; g_net.accept_n = 1;
|
||||
CHECK((lftpd_inet_accept(3) == 9) && (g_net.delay_calls == 0),
|
||||
g_net.accept_seq[0] = 1; g_net.accept_n = 1;
|
||||
CHECK((lftpd_inet_accept(0) == 1) && (g_net.delay_calls == 0),
|
||||
"TC-LFTINET-010 an immediate hit neither sleeps nor waits");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_seq[2] = 9;
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_seq[2] = 1;
|
||||
g_net.accept_n = 3;
|
||||
CHECK((lftpd_inet_accept(3) == 9) && (g_net.delay_calls == 2) &&
|
||||
CHECK((lftpd_inet_accept(0) == 1) && (g_net.delay_calls == 2) &&
|
||||
(g_lfi_info_count == 0),
|
||||
"TC-LFTINET-011 every failed round yields the CPU (and feeds the watchdog in the same block) until it succeeds");
|
||||
|
||||
@@ -311,25 +325,25 @@ static void tc_accept(void)
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_seq[2] = -1;
|
||||
g_net.accept_n = 3;
|
||||
g_net.gen_flip_after = 3; /* 第 3 轮时网络重建 */
|
||||
CHECK((lftpd_inet_accept(3) == -1) && (g_lfi_info_count == 1) &&
|
||||
CHECK((lftpd_inet_accept(0) == -1) && (g_lfi_info_count == 1) &&
|
||||
(g_net.accept_calls == 3),
|
||||
"TC-LFTINET-012 a generation change aborts accept immediately (otherwise the listener stays on the old generation after the new IP takes effect)");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = 9; g_net.accept_n = 2;
|
||||
CHECK((lftpd_inet_accept_timeout(3, 5000) == 9) && (g_net.delay_calls == 1),
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = 1; g_net.accept_n = 2;
|
||||
CHECK((lftpd_inet_accept_timeout(0, 5000) == 1) && (g_net.delay_calls == 1),
|
||||
"TC-LFTINET-020 the data channel is accepted inside the timeout window");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_seq[1] = -1; g_net.accept_n = 2;
|
||||
g_net.armed = 0; /* 监听门被撤(会话已放弃) */
|
||||
CHECK((lftpd_inet_accept_timeout(3, 5000) == -1) && (g_net.accept_calls == 1) &&
|
||||
CHECK((lftpd_inet_accept_timeout(0, 5000) == -1) && (g_net.accept_calls == 1) &&
|
||||
(g_lfi_error_count == 1),
|
||||
"TC-LFTINET-021 lowering the listener gate gives up at once instead of burning the full 5 s on a dead listener");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
g_net.accept_seq[0] = -1; g_net.accept_n = 1;
|
||||
CHECK((lftpd_inet_accept_timeout(3, 300) == -1) && (g_net.delay_calls == 3) &&
|
||||
CHECK((lftpd_inet_accept_timeout(0, 300) == -1) && (g_net.delay_calls == 3) &&
|
||||
(g_lfi_info_count == 1),
|
||||
"TC-LFTINET-022 the peer never opens the data channel: step by 100ms to the limit and finish as INFO");
|
||||
}
|
||||
@@ -437,8 +451,13 @@ static void tc_write_read(void)
|
||||
"TC-LFTINET-062 other negative values keep waiting until the 30 s budget is exhausted");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
CHECK((lftpd_inet_close(3) == 0) && (g_net.close_calls == 1),
|
||||
"TC-LFTINET-070 close only forwards to net_close");
|
||||
lfi_fd_used[0] = 1; /* 假对象:fd 0 已由假 net_socket 分配(与生产同域,0 基) */
|
||||
CHECK((lftpd_inet_close(0) == 0) && (g_net.close_calls == 1),
|
||||
"TC-LFTINET-070 close only forwards to net_close (an allocated fd)");
|
||||
|
||||
net_reset(); logs_clear();
|
||||
CHECK((lftpd_inet_close(0) == NET_FD_INVALID) && (g_net.close_calls == 1),
|
||||
"TC-LFTINET-071 closing an unallocated fd must fail (fake mirrors the owner semantics)");
|
||||
}
|
||||
|
||||
int main(void)
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
/* 真实 net_socket.h 会把 FreeRTOS.h / task.h 一起带给调用方,
|
||||
* lftpd_inet.c 正是靠那条链拿 TickType_t / vTaskDelay / pdMS_TO_TICKS,
|
||||
* 所以桩必须照做同样的 include(少一行就是 C2065 未声明)。 */
|
||||
|
||||
Reference in New Issue
Block a user