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:
@@ -121,6 +121,21 @@ typedef struct {
|
||||
|
||||
static lftp_net_t g_n;
|
||||
|
||||
/* 假 inet 层的 fd 分配集合(契约 C5/C6/C7):与生产同域的 0 基句柄,
|
||||
* 未分配 / 越界的 lftpd_inet_close 必须失败(返回 NET_FD_INVALID)。 */
|
||||
#define LFTP_FAKE_MAX_FD 8
|
||||
static int g_n_fd_used[LFTP_FAKE_MAX_FD];
|
||||
|
||||
static int lftp_fake_fd_alloc(int fd)
|
||||
{
|
||||
/* 测试代码:假对象域校验用的裸区间判据(契约 C6),非生产判据 */
|
||||
if (fd < 0 || fd >= LFTP_FAKE_MAX_FD || g_n_fd_used[fd] != 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
g_n_fd_used[fd] = 1;
|
||||
return fd;
|
||||
}
|
||||
|
||||
int lftpd_inet_read_line(int socket, char *buffer, size_t buffer_len)
|
||||
{
|
||||
(void)socket;
|
||||
@@ -168,7 +183,10 @@ int lftpd_inet_listen(int port)
|
||||
{
|
||||
(void)port;
|
||||
g_n.listen_calls++;
|
||||
return g_n.listen_rc;
|
||||
if (g_n.listen_rc < 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
return lftp_fake_fd_alloc(g_n.listen_rc);
|
||||
}
|
||||
|
||||
int lftpd_inet_get_socket_port(int socket)
|
||||
@@ -188,13 +206,20 @@ int lftpd_inet_accept_timeout(int socket, int timeout_ms)
|
||||
(void)socket;
|
||||
(void)timeout_ms;
|
||||
g_n.accept_calls++;
|
||||
return g_n.accept_to_rc;
|
||||
if (g_n.accept_to_rc < 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
return lftp_fake_fd_alloc(g_n.accept_to_rc);
|
||||
}
|
||||
|
||||
int lftpd_inet_close(int socket)
|
||||
{
|
||||
(void)socket;
|
||||
g_n.close_calls++;
|
||||
/* 契约 C6:越界 / 未分配一律失败(假对象复刻生产主人语义) */
|
||||
if (socket < 0 || socket >= LFTP_FAKE_MAX_FD || g_n_fd_used[socket] == 0) {
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
g_n_fd_used[socket] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -379,11 +404,12 @@ static lftpd_client_t g_cli;
|
||||
static void reset_all(void)
|
||||
{
|
||||
(void)memset(&g_n, 0, sizeof(g_n));
|
||||
(void)memset(g_n_fd_used, 0, sizeof(g_n_fd_used));
|
||||
(void)memset(&g_io, 0, sizeof(g_io));
|
||||
g_n.string_rc = 0;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1; /* 假 fd 域与生产对齐:0 基(契约 C5/C7) */
|
||||
g_n.port = 5000;
|
||||
g_n.accept_to_rc = 21; /* 默认数据通道能连上 */
|
||||
g_n.accept_to_rc = 2; /* 默认数据通道能连上 */
|
||||
g_n.data_write_rc = 0;
|
||||
g_io.stat_rc = 0;
|
||||
g_io.is_dir = 1;
|
||||
@@ -408,8 +434,8 @@ static void reset_all(void)
|
||||
g_sockname_rc = 0;
|
||||
(void)memset(&g_cli, 0, sizeof(g_cli));
|
||||
(void)strcpy(g_cli.directory, "/");
|
||||
g_cli.socket = 10;
|
||||
g_cli.data_socket = -1;
|
||||
g_cli.socket = 0;
|
||||
g_cli.data_socket = NET_FD_INVALID;
|
||||
/* 不写死字段名:认证状态的结构由 lftpd_auth.h 定义,本模块只把它当黑盒清零
|
||||
(口令/锁定逻辑有 test/host/ftp_auth 的 10 条专测,这里不重复验)。 */
|
||||
(void)memset(&s_auth_state, 0, sizeof(s_auth_state));
|
||||
@@ -479,10 +505,11 @@ static void tc_gates(void)
|
||||
"TC-LFTPD-005 if the welcome never got through (peer already gone) finish straight away instead of spinning on reads; that trace really is INFO");
|
||||
|
||||
reset_all();
|
||||
g_cli.data_socket = 33; /* 被动模式已开但客户端直接跑了 */
|
||||
g_cli.data_socket = 1; /* 被动模式已开但客户端直接跑了(假对象域内、已分配) */
|
||||
g_n_fd_used[1] = 1;
|
||||
feed("QUIT", NULL, NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((g_n.close_calls == 1) && (g_cli.data_socket == -1),
|
||||
CHECK((g_n.close_calls == 1) && (g_cli.data_socket == NET_FD_INVALID),
|
||||
"TC-LFTPD-006 on exit the still-open data listener must be released (a single-socket chip must not be left with a dangling socket)");
|
||||
|
||||
reset_all();
|
||||
@@ -495,7 +522,7 @@ static void tc_gates(void)
|
||||
g_cli.auth_logged_in = 1;
|
||||
g_io.opendir_rc = 0;
|
||||
g_io.readdir_n = 0;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1;
|
||||
feed("LIST", NULL, NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("425 ") == 1) && (g_n.accept_calls == 0),
|
||||
@@ -513,7 +540,7 @@ static void tc_passive(void)
|
||||
关掉(那正是 TC-LFTPD-006 要验的行为),这里要看的是 PASV 自己留下的状态。 */
|
||||
(void)cmd_pasv(&g_cli, NULL);
|
||||
CHECK((strcmp(rep(0), "227 Entering Passive Mode (192,168,31,1,19,136).\r\n") == 0) &&
|
||||
(g_cli.data_socket == 20) && (g_n.listen_calls == 1),
|
||||
(g_cli.data_socket == 1) && (g_n.listen_calls == 1),
|
||||
"TC-LFTPD-011 the 227 tuple: ip through htonl then high byte to low byte (dotted order), port high/low, and the passive listen handle is recorded");
|
||||
|
||||
reset_all();
|
||||
@@ -522,7 +549,7 @@ static void tc_passive(void)
|
||||
feed("PASV", NULL, NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("425 ") == 1) && (g_n.close_calls == 1) &&
|
||||
(g_cli.data_socket == -1),
|
||||
(g_cli.data_socket == NET_FD_INVALID),
|
||||
"TC-LFTPD-012 when the local ip is unavailable the listener just created must be closed (no half-passive mode left behind)");
|
||||
|
||||
reset_all();
|
||||
@@ -534,12 +561,12 @@ static void tc_passive(void)
|
||||
|
||||
reset_all();
|
||||
g_cli.auth_logged_in = 1;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1;
|
||||
g_n.accept_to_rc = -1; /* 对端一直不开数据通道 */
|
||||
feed("PASV", "LIST", NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("150 ") == 1) && (rep_has("425 ") == 1) &&
|
||||
(g_cli.data_socket == -1) && (g_n.close_calls == 1),
|
||||
(g_cli.data_socket == NET_FD_INVALID) && (g_n.close_calls == 1),
|
||||
"TC-LFTPD-014 a failed data accept reports 425 and closes and resets the listener instead of leaving it to the next command");
|
||||
|
||||
reset_all();
|
||||
@@ -593,7 +620,7 @@ static void tc_transfer(void)
|
||||
reset_all();
|
||||
g_cli.auth_logged_in = 1;
|
||||
g_cfg.write_en = 0u;
|
||||
g_n.listen_rc = 20;
|
||||
g_n.listen_rc = 1;
|
||||
feed("PASV", "STOR up.bin", NULL, NULL);
|
||||
(void)handle_control_channel(&g_cli);
|
||||
CHECK((rep_has("550 ") == 1) && (g_n.accept_calls == 0) &&
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#ifndef NET_SOCKET_H
|
||||
#define NET_SOCKET_H
|
||||
|
||||
#include "net_fd.h" /* NET_FD_INVALID:与生产同一份契约(stub 不复制失效值) */
|
||||
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user