From 66c6cd8aa818fc1b31f0d646817b7577c11396fc Mon Sep 17 00:00:00 2001
From: bitcoffee <liuxin350@huawei.com>
Date: Thu, 12 Dec 2024 19:41:12 +0800
Subject: [PATCH] remove libboundscheck dependency
Signed-off-by: bitcoffee <liuxin350@huawei.com>
oncn-mda/cli_src/CMakeLists.txt | 2 +-
oncn-mda/cli_src/func/chain.c | 23 ++++----------
oncn-mda/cli_src/func/global.c | 53 +++++++++------------------------
oncn-mda/cli_src/func/log.c | 2 +-
oncn-mda/cli_src/func/switch.c | 16 ++++------
oncn-mda/include/log.h | 1 -
oncn-mda/include/macli.h | 1 -
7 files changed, 28 insertions(+), 70 deletions(-)
@@ -14,6 +14,6 @@ if($ENV{HS_COVERAGE_ENABLE})
endif($ENV{HS_COVERAGE_ENABLE})
add_executable(mdacore mdacore.c ${SRC_LIST})
-target_link_libraries(mdacore -lbpf -lboundscheck -lelf -lz -lm)
+target_link_libraries(mdacore -lbpf -lelf -lz -lm)
MESSAGE("
@@ -32,14 +32,9 @@ static int get_input_ip(const char *const src, struct input_filter_rule *const i
macli_log(ERR, "over the max cidrs set num, max is %d\n", MAX_PARAM_LENGTH);
return FAILED;
}
- int ret = strcpy_s(input_filter_rules->input_ip[(input_filter_rules->input_ip_num)++], MAX_CIDR_LENGTH, src);
- if (ret == ERANGE_AND_RESET) {
- macli_log(ERR, "input cidr string too long!\n");
- return FAILED;
- } else if (ret != EOK) {
- macli_log(ERR, "get filter rules failed! errno:%d\n", ret);
- return FAILED;
- }
+ (void)memset(input_filter_rules->input_ip[(input_filter_rules->input_ip_num)], 0x0, MAX_CIDR_LENGTH);
+ (void)strncpy(input_filter_rules->input_ip[(input_filter_rules->input_ip_num)++], src, MAX_CIDR_LENGTH - 1);
+
return SUCCESS;
}
@@ -49,15 +44,9 @@ static int get_input_port(const char *const src, struct input_filter_rule *const
macli_log(ERR, "over the max ports set num, max is %d\n", MAX_PARAM_LENGTH);
return FAILED;
}
- int ret =
- strcpy_s(input_filter_rules->input_port[(input_filter_rules->input_port_num)++], MAX_PORT_RANGE_LENGTH, src);
- if (ret == ERANGE_AND_RESET) {
- macli_log(ERR, "input port string is too long!\n");
- return FAILED;
- } else if (ret != EOK) {
- macli_log(ERR, "get filter rules failed! errno:%d\n", ret);
- return FAILED;
- }
+ (void)memset(input_filter_rules->input_port[(input_filter_rules->input_port_num)], 0x0, MAX_PORT_RANGE_LENGTH);
+ (void)strncpy(input_filter_rules->input_port[(input_filter_rules->input_port_num)++], src, MAX_PORT_RANGE_LENGTH - 1);
+
return SUCCESS;
}
@@ -113,10 +113,8 @@ static int get_prog_fd(const char *const prog_name, int *const fd)
__u32 obj_id = 0;
__u32 info_length = sizeof(struct bpf_prog_info);
while (true) {
- if (memset_s(&prog_info, info_length, 0x0, info_length) != EOK) {
- macli_log(ERR, "system memset failed!\n");
- return FAILED;
- }
+ (void)memset(&prog_info, 0x0, info_length);
+
if (bpf_prog_get_next_id(obj_id, &obj_id)) {
if (errno == ENOENT)
break;
@@ -151,10 +149,7 @@ static int get_map_fd(const char *const map_name, int *const fd)
__u32 obj_id = 0;
__u32 info_length = sizeof(struct bpf_map_info);
while (true) {
- if (memset_s(&map_info, info_length, 0x0, info_length) != EOK) {
- macli_log(ERR, "system memset failed!\n");
- return FAILED;
- }
+ (void)memset(&map_info, 0x0, info_length);
if (bpf_map_get_next_id(obj_id, &obj_id)) {
if (errno == ENOENT)
break;
@@ -192,13 +187,10 @@ static int init_mesh_map(
struct bpf_create_map_attr *const map_attr)
#endif
{
- int ret = EOK;
- ret += strcpy_s(fds_map->name, BPF_OBJ_NAME_LEN, map_name);
- ret += strcpy_s(fds_map->pin_file_path, PATH_MAX, pin_file_path);
- if (ret != EOK) {
- macli_log(ERR, "system copy string failed!");
- return FAILED;
- }
+ (void)memset(fds_map->name, 0x0, BPF_OBJ_NAME_LEN);
+ (void)strncpy(fds_map->name, map_name, BPF_OBJ_NAME_LEN - 1);
+ (void)memset(fds_map->pin_file_path, 0x0, PATH_MAX);
+ (void)strncpy(fds_map->pin_file_path, pin_file_path, PATH_MAX - 1);
if (get_map_fd(fds_map->name, &(fds_map->fd)) != SUCCESS)
return FAILED;
fds_map->xattr = map_attr;
@@ -212,12 +204,8 @@ static int init_mesh_prog(
enum bpf_attach_type attach_type,
int attach_fd)
{
- int ret = EOK;
- ret = strcpy_s(fds_prog->name, BPF_OBJ_NAME_LEN, prog_name);
- if (ret != EOK) {
- macli_log(ERR, "system copy string failed!");
- return FAILED;
- }
+ (void)memset(fds_prog->name, 0x0, BPF_OBJ_NAME_LEN);
+ (void)strncpy(fds_prog->name, prog_name, BPF_OBJ_NAME_LEN - 1);
if (get_prog_fd(fds_prog->name, &(fds_prog->fd)) != SUCCESS)
return FAILED;
fds_prog->attach_type = attach_type;
@@ -228,13 +216,8 @@ static int init_mesh_prog(
static int init_mesh_prog_pin_file(struct mesh_prog_info *const fds_prog, const char *const pin_file_path)
{
- int ret = EOK;
- ret = strcpy_s(fds_prog->pin_file_path, PATH_MAX, pin_file_path);
- if (ret != EOK) {
- macli_log(ERR, "system copy string failed!");
- return FAILED;
- }
-
+ (void)memset(fds_prog->pin_file_path, 0x0, PATH_MAX);
+ (void)strncpy(fds_prog->pin_file_path, pin_file_path, PATH_MAX - 1);
return SUCCESS;
}
@@ -318,7 +301,7 @@ int get_u32_num(const char *const src, __u32 *const ret)
const int convert_base = 10;
char tmp_buff[TMP_BUF_SIZE] = {0};
unsigned long tmp = strtoul(src, NULL, convert_base);
- if (sprintf_s(tmp_buff, sizeof(tmp_buff), "%lu", tmp) < 0) {
+ if (snprintf(tmp_buff, sizeof(tmp_buff), "%lu", tmp) < 0) {
macli_log(ERR, "system sprintf string failed!\n");
return FAILED;
}
@@ -332,12 +315,8 @@ int get_u32_num(const char *const src, __u32 *const ret)
int check_cidr(const char *const src, __u32 *const ip, __u32 *const mask)
{
- int ret = EOK;
char tmp_buff[MAX_CIDR_LENGTH] = {0};
- if ((ret = strcpy_s(tmp_buff, sizeof(tmp_buff), src)) != EOK) {
- macli_log(ERR, "system copy string failed! errno:%d\n", ret);
- return FAILED;
- }
+ (void)strncpy(tmp_buff, src, sizeof(tmp_buff) - 1);
char *ip_part = tmp_buff;
char *p = strrchr(tmp_buff, '/');
if (p == NULL)
@@ -358,12 +337,8 @@ int check_cidr(const char *const src, __u32 *const ip, __u32 *const mask)
int check_port(const char *const src, __u32 *const begin_port, __u32 *const end_port)
{
- int ret = EOK;
char tmp_buff[MAX_PORT_RANGE_LENGTH] = {0};
- if ((ret = strcpy_s(tmp_buff, sizeof(tmp_buff), src)) != EOK) {
- macli_log(ERR, "system copy string failed! errno:%d\n", ret);
- return FAILED;
- }
+ (void)strncpy(tmp_buff, src, sizeof(tmp_buff) - 1);
// support 80-90
// support 80
char *num1 = tmp_buff;
@@ -20,7 +20,7 @@ void ma_log(enum LOG_LEVEL level, const char *format, ...)
va_list ap;
va_start(ap, format);
char fmt_str[MAX_FMT_STR_LENGTH] = {0};
- if (vsnprintf_s(fmt_str, sizeof(fmt_str), sizeof(fmt_str) - 1, format, ap) == -1) {
+ if (vsnprintf(fmt_str, sizeof(fmt_str), format, ap) < 0) {
va_end(ap);
return;
}
@@ -365,7 +365,6 @@ static int check_file_access(const char *const config_path)
static int read_chain_config(const char *const config_path, struct sock_param *const filter_rules)
{
- int ret;
if (check_file_access(config_path) != SUCCESS)
return FAILED;
FILE *config_file = fopen(config_path, "r");
@@ -384,10 +383,10 @@ static int read_chain_config(const char *const config_path, struct sock_param *c
if (*p == '#' || *p == '\0')
continue;
- if ((ret = strcpy_s(buf_save, sizeof(buf_save), buf)) != EOK) {
- macli_log(ERR, "system copy string failed! errno:%d\n", ret);
- continue;
- }
+ (void)memset(buf_save, 0x0, sizeof(buf_save));
+ (void)strncpy(buf_save, buf, sizeof(buf_save));
+ buf_save[MAX_BUFSIZE - 1] = 0;
+
char *chain_argv[MAX_INPUT] = {0};
int chain_argc = 0;
if (parser_arg(buf, (int)strlen(buf), &chain_argc, chain_argv) != SUCCESS)
@@ -519,15 +518,12 @@ int do_enable(int argc, char *const *argv)
char config_path[PATH_MAX] = {0};
struct sock_param filter_rules = {0};
struct mesh_service_info fds = {0};
- int ret;
if (set_rlimit() != SUCCESS)
return FAILED;
- if ((ret = strcpy_s(config_path, PATH_MAX, CONFIGFILE_PATH)) != EOK) {
- macli_log(ERR, "system copy string failed! errno:%d\n", ret);
- return FAILED;
- }
+ (void)memset(config_path, 0x0, PATH_MAX);
+ (void)strncpy(config_path, CONFIGFILE_PATH, PATH_MAX - 1);
if (enable_get_opt(argc, argv, config_path, &is_help) != SUCCESS)
return FAILED;
@@ -8,7 +8,6 @@
#include <stdlib.h>
#include <time.h>
#include <stdarg.h>
-#include "securec.h"
enum LOG_LEVEL { FATAL = 0, ERR, WARN, INFO, DEBUG };
@@ -20,7 +20,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/stat.h>
-#include "securec.h"
#include "data.h"
#include "log.h"
--
2.33.0