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:
@@ -380,13 +380,14 @@ static int cmd_dele(lftpd_client_t *client, const char *arg)
|
||||
|
||||
static int cmd_epsv(lftpd_client_t *client, const char *arg)
|
||||
{
|
||||
if (client->data_socket >= 0) {
|
||||
if (client->data_socket != NET_FD_INVALID) {
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
}
|
||||
|
||||
int listener_socket = lftpd_inet_listen(0);
|
||||
if (listener_socket < 0) {
|
||||
int listener_socket = NET_FD_INVALID;
|
||||
listener_socket = lftpd_inet_listen(0);
|
||||
if (listener_socket == NET_FD_INVALID) {
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
return -1;
|
||||
}
|
||||
@@ -414,19 +415,20 @@ static int cmd_feat(lftpd_client_t *client, const char *arg)
|
||||
|
||||
static int cmd_list(lftpd_client_t *client, const char *arg)
|
||||
{
|
||||
if (client->data_socket == -1) {
|
||||
if (client->data_socket == NET_FD_INVALID) {
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
return -1;
|
||||
}
|
||||
|
||||
send_simple_response(client->socket, 150, STATUS_150);
|
||||
int data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock < 0) {
|
||||
int data_sock = NET_FD_INVALID;
|
||||
data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock == NET_FD_INVALID) {
|
||||
lftpd_log_peer("%s data accept failed (peer gone?), sk=%d",
|
||||
__func__, client->data_socket);
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -435,7 +437,7 @@ static int cmd_list(lftpd_client_t *client, const char *arg)
|
||||
* 不关会让客户端一直读到超时(曾试"优雅断开+复用监听器"方案,因该语义限制
|
||||
* 与芯片行为未能稳定工作,见 链路延迟测试说明.md §8.2)。 */
|
||||
lftpd_inet_close(data_sock);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
|
||||
if (err == 0) {
|
||||
send_simple_response(client->socket, 226, STATUS_226);
|
||||
@@ -447,19 +449,20 @@ static int cmd_list(lftpd_client_t *client, const char *arg)
|
||||
|
||||
static int cmd_nlst(lftpd_client_t *client, const char *arg)
|
||||
{
|
||||
if (client->data_socket == -1) {
|
||||
if (client->data_socket == NET_FD_INVALID) {
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
return -1;
|
||||
}
|
||||
|
||||
send_simple_response(client->socket, 150, STATUS_150);
|
||||
int data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock < 0) {
|
||||
int data_sock = NET_FD_INVALID;
|
||||
data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock == NET_FD_INVALID) {
|
||||
lftpd_log_peer("%s data accept failed (peer gone?), sk=%d",
|
||||
__func__, client->data_socket);
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -468,7 +471,7 @@ static int cmd_nlst(lftpd_client_t *client, const char *arg)
|
||||
* 不关会让客户端一直读到超时(曾试"优雅断开+复用监听器"方案,因该语义限制
|
||||
* 与芯片行为未能稳定工作,见 链路延迟测试说明.md §8.2)。 */
|
||||
lftpd_inet_close(data_sock);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
|
||||
if (err == 0) {
|
||||
send_simple_response(client->socket, 226, STATUS_226);
|
||||
@@ -518,15 +521,16 @@ static int cmd_pass(lftpd_client_t *client, const char *arg)
|
||||
|
||||
static int cmd_pasv(lftpd_client_t *client, const char *arg)
|
||||
{
|
||||
if (client->data_socket >= 0) {
|
||||
if (client->data_socket != NET_FD_INVALID) {
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
}
|
||||
|
||||
/* 原 3×200ms 应用层重试已删(lftpd_inet_listen 单次化)——
|
||||
* 失败直接 425,FTP 客户端自带传输重试语义;服务端不再叠阻塞重试 */
|
||||
int listener_socket = lftpd_inet_listen(0);
|
||||
if (listener_socket < 0) {
|
||||
int listener_socket = NET_FD_INVALID;
|
||||
listener_socket = lftpd_inet_listen(0);
|
||||
if (listener_socket == NET_FD_INVALID) {
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
return -1;
|
||||
}
|
||||
@@ -578,19 +582,20 @@ static int cmd_quit(lftpd_client_t *client, const char *arg)
|
||||
|
||||
static int cmd_retr(lftpd_client_t *client, const char *arg)
|
||||
{
|
||||
if (client->data_socket == -1) {
|
||||
if (client->data_socket == NET_FD_INVALID) {
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
return -1;
|
||||
}
|
||||
|
||||
send_simple_response(client->socket, 150, STATUS_150);
|
||||
int data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock < 0) {
|
||||
int data_sock = NET_FD_INVALID;
|
||||
data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock == NET_FD_INVALID) {
|
||||
lftpd_log_peer("%s data accept failed (peer gone?), sk=%d",
|
||||
__func__, client->data_socket);
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -601,7 +606,7 @@ static int cmd_retr(lftpd_client_t *client, const char *arg)
|
||||
* 不关会让客户端一直读到超时(曾试"优雅断开+复用监听器"方案,因该语义限制
|
||||
* 与芯片行为未能稳定工作,见 链路延迟测试说明.md §8.2)。 */
|
||||
lftpd_inet_close(data_sock);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
|
||||
if (err == 0) {
|
||||
lftpd_log_info("DOWNLOAD '%s' OK", path);
|
||||
@@ -646,19 +651,20 @@ static int cmd_stor(lftpd_client_t *client, const char *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (client->data_socket == -1) {
|
||||
if (client->data_socket == NET_FD_INVALID) {
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
return -1;
|
||||
}
|
||||
|
||||
send_simple_response(client->socket, 150, STATUS_150);
|
||||
int data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock < 0) {
|
||||
int data_sock = NET_FD_INVALID;
|
||||
data_sock = lftpd_inet_accept_timeout(client->data_socket, 5000);
|
||||
if (data_sock == NET_FD_INVALID) {
|
||||
lftpd_log_peer("%s data accept failed (peer gone?), sk=%d",
|
||||
__func__, client->data_socket);
|
||||
send_simple_response(client->socket, 425, STATUS_425);
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -669,7 +675,7 @@ static int cmd_stor(lftpd_client_t *client, const char *arg)
|
||||
* 不关会让客户端一直读到超时(曾试"优雅断开+复用监听器"方案,因该语义限制
|
||||
* 与芯片行为未能稳定工作,见 链路延迟测试说明.md §8.2)。 */
|
||||
lftpd_inet_close(data_sock);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
|
||||
if (err == 0) {
|
||||
uint32_t size = 0;
|
||||
@@ -798,9 +804,9 @@ static int handle_control_channel(lftpd_client_t *client)
|
||||
|
||||
cleanup:
|
||||
/* 数据监听器在复用模式下会跨命令保留,会话结束必须显式释放(否则每次会话泄漏一个 Socket) */
|
||||
if (client->data_socket >= 0) {
|
||||
if (client->data_socket != NET_FD_INVALID) {
|
||||
lftpd_inet_close(client->data_socket);
|
||||
client->data_socket = -1;
|
||||
client->data_socket = NET_FD_INVALID;
|
||||
}
|
||||
/* 控制通道不得 close:单连接模型下它即监听器(fd 与监听一体),EOF/断连时
|
||||
* net 层已 auto_relisten 回 LISTEN;此处 close 会连监听一起毁掉并触发
|
||||
@@ -815,7 +821,7 @@ int lftpd_start(const char *directory, int port, lftpd_t *lftpd)
|
||||
|
||||
lftpd->directory = directory;
|
||||
lftpd->port = port;
|
||||
lftpd->server_socket = -1; /* memset 清零后显式置"无监听器"(0 是合法 fd) */
|
||||
lftpd->server_socket = NET_FD_INVALID; /* memset 清零后显式置"无监听器"(0 是合法 fd) */
|
||||
|
||||
/* 出厂默认口令在用告警(台架锚点;改了 [ftp] pwd_hash 即消失) */
|
||||
if (ftp_cfg_is_default_pwd() != 0) {
|
||||
@@ -824,10 +830,10 @@ int lftpd_start(const char *directory, int port, lftpd_t *lftpd)
|
||||
|
||||
while (true) {
|
||||
lftpd_task_wd_beat(); /* 看门狗:事件循环每轮喂心跳(ftpTask 主循环节拍点) */
|
||||
if (lftpd->server_socket < 0) {
|
||||
if (lftpd->server_socket == NET_FD_INVALID) {
|
||||
/* 首次启动 / 网络重建后:全量创建监听器(socket+bind+listen) */
|
||||
lftpd->server_socket = lftpd_inet_listen(port);
|
||||
if (lftpd->server_socket < 0) {
|
||||
if (lftpd->server_socket == NET_FD_INVALID) {
|
||||
lftpd_log_error("error creating listener");
|
||||
/* 看门狗:3s 重试等待拆短片喂心跳(单次 3s 挂起超 IWDG 最坏窗
|
||||
* ~1.7s → 误复位;与 time_sync.c 监听重试同模式) */
|
||||
@@ -848,11 +854,12 @@ int lftpd_start(const char *directory, int port, lftpd_t *lftpd)
|
||||
|
||||
lftpd_log_info("waiting for connection...");
|
||||
|
||||
int client_socket = lftpd_inet_accept(lftpd->server_socket);
|
||||
if (client_socket < 0) {
|
||||
int client_socket = NET_FD_INVALID;
|
||||
client_socket = lftpd_inet_accept(lftpd->server_socket);
|
||||
if (client_socket == NET_FD_INVALID) {
|
||||
lftpd_log_peer("listener rebuilt (reason logged by accept layer)");
|
||||
lftpd_inet_close(lftpd->server_socket);
|
||||
lftpd->server_socket = -1; /* 监听器已不可用(网络重建):下轮重建 */
|
||||
lftpd->server_socket = NET_FD_INVALID; /* 监听器已不可用(网络重建):下轮重建 */
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -876,12 +883,15 @@ int lftpd_start(const char *directory, int port, lftpd_t *lftpd)
|
||||
}
|
||||
}
|
||||
|
||||
static lftpd_client_t client; /* static: off-stack session context (single session) */
|
||||
static lftpd_client_t client = { /* static: off-stack session context (single session) */
|
||||
.socket = NET_FD_INVALID,
|
||||
.data_socket = NET_FD_INVALID,
|
||||
};
|
||||
memset(&client, 0, sizeof(client));
|
||||
strncpy(client.directory, directory, sizeof(client.directory) - 1);
|
||||
client.directory[sizeof(client.directory) - 1] = '\0';
|
||||
client.socket = client_socket;
|
||||
client.data_socket = -1;
|
||||
client.data_socket = NET_FD_INVALID;
|
||||
|
||||
lftpd->client = &client;
|
||||
handle_control_channel(&client);
|
||||
@@ -894,7 +904,7 @@ int lftpd_start(const char *directory, int port, lftpd_t *lftpd)
|
||||
|
||||
int lftpd_stop(lftpd_t *lftpd)
|
||||
{
|
||||
if (lftpd->server_socket >= 0) {
|
||||
if (lftpd->server_socket != NET_FD_INVALID) {
|
||||
lftpd_inet_close(lftpd->server_socket);
|
||||
}
|
||||
if (lftpd->client) {
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
typedef struct {
|
||||
char directory[256];
|
||||
/* 两个 fd 均遵循 NET_FD_INVALID 契约:0 是合法 fd,失效值只认 NET_FD_INVALID
|
||||
* (docs/网络/网络句柄失效值契约.md);对象 memset 后必须在 5 行内重置 */
|
||||
int socket;
|
||||
int data_socket;
|
||||
/* FTP 鉴权会话态(每会话 memset 0 = 未登录;跨会话锁定计数在
|
||||
@@ -16,7 +18,7 @@ typedef struct {
|
||||
typedef struct {
|
||||
const char *directory;
|
||||
int port;
|
||||
int server_socket;
|
||||
int server_socket; /* 监听 fd;无监听器 = NET_FD_INVALID(0 是合法 fd) */
|
||||
lftpd_client_t *client;
|
||||
} lftpd_t;
|
||||
|
||||
|
||||
@@ -37,10 +37,11 @@ int lftpd_inet_listen(int port)
|
||||
* 监听交给 FTP 客户端自身的重试语义(主流 FTP 服务器 passive listen 失败
|
||||
* 亦直接 425,不在服务端叠应用层阻塞重试) */
|
||||
lftpd_task_wd_beat(); /* 看门狗:入口喂心跳 */
|
||||
int s = net_socket(NET_AF_INET, NET_SOCK_STREAM);
|
||||
if (s < 0) {
|
||||
int s = NET_FD_INVALID;
|
||||
s = net_socket(NET_AF_INET, NET_SOCK_STREAM);
|
||||
if (s == NET_FD_INVALID) {
|
||||
DBG_ERROR("create socket");
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
|
||||
struct net_sockaddr_in addr;
|
||||
@@ -51,7 +52,7 @@ int lftpd_inet_listen(int port)
|
||||
if (net_bind(s, (struct net_sockaddr *)&addr, sizeof(addr)) < 0) {
|
||||
DBG_ERROR("bind port %d", port);
|
||||
net_close(s);
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
|
||||
if (net_listen(s) >= 0) {
|
||||
@@ -60,7 +61,7 @@ int lftpd_inet_listen(int port)
|
||||
|
||||
DBG_ERROR("listen port %d failed", port);
|
||||
net_close(s);
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
|
||||
int lftpd_inet_get_socket_port(int socket)
|
||||
@@ -83,14 +84,15 @@ int lftpd_inet_accept(int socket)
|
||||
uint32_t gen = net_get_generation();
|
||||
|
||||
while (1) {
|
||||
int s = net_accept(socket, NULL, NULL);
|
||||
if (s >= 0) {
|
||||
int s = NET_FD_INVALID;
|
||||
s = net_accept(socket, NULL, NULL);
|
||||
if (s != NET_FD_INVALID) {
|
||||
return s;
|
||||
}
|
||||
if (net_get_generation() != gen) {
|
||||
/* 运维改 IP 的正常后果,不是缺陷 → info(级别划分见存储架构说明 §10.3) */
|
||||
DBG_INFO("network re-init: abort accept, relisten");
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
lftpd_task_wd_beat(); /* 看门狗:自旋轮次喂心跳(无限等待,可能长时间无客户端) */
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
@@ -102,8 +104,9 @@ int lftpd_inet_accept_timeout(int socket, int timeout_ms)
|
||||
int elapsed = 0;
|
||||
|
||||
while (elapsed < timeout_ms) {
|
||||
int s = net_accept(socket, NULL, NULL);
|
||||
if (s >= 0) {
|
||||
int s = NET_FD_INVALID;
|
||||
s = net_accept(socket, NULL, NULL);
|
||||
if (s != NET_FD_INVALID) {
|
||||
return s;
|
||||
}
|
||||
/* M2 镜像门控退役(自愈专项实验 2026-10-12;沉降门失效族收口,
|
||||
@@ -115,7 +118,7 @@ int lftpd_inet_accept_timeout(int socket, int timeout_ms)
|
||||
/* **故意留 error**:控制连接还活着、我方数据监听却已不在服役 →
|
||||
* 这是本侧异常,不是对端行为 */
|
||||
DBG_ERROR("data listener disarmed, accept aborted");
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
lftpd_task_wd_beat(); /* 看门狗:每轮喂心跳(数据连接等待最长 5s) */
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
@@ -124,7 +127,7 @@ int lftpd_inet_accept_timeout(int socket, int timeout_ms)
|
||||
|
||||
/* 客户端连上控制通道却没来建数据连接(中止/被防火墙拦)= 对端行为 → info */
|
||||
DBG_INFO("accept timeout (%dms) - peer never opened data channel", timeout_ms);
|
||||
return -1;
|
||||
return NET_FD_INVALID;
|
||||
}
|
||||
|
||||
int lftpd_inet_read_line(int socket, char *buffer, size_t buffer_len)
|
||||
|
||||
Reference in New Issue
Block a user