From 16902f6232d7e194ebd95f2748526a9d16e3ee94 Mon Sep 17 00:00:00 2001 From: "Christian S.J. Peron" Date: Sat, 8 Nov 2025 01:55:15 -0600 Subject: [PATCH 1/4] Add buffer overflow test --- src/cblockd/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cblockd/main.c b/src/cblockd/main.c index ac6c5fc..ee2858d 100644 --- a/src/cblockd/main.c +++ b/src/cblockd/main.c @@ -234,7 +234,9 @@ main(int argc, char *argv [], char *env[]) int option_index, c, zfs_selected; pthread_t thr; char *r; + char buf[32]; + strcpy(buf, argv[1]); gcfg.c_data_dir = DEFAULT_DATA_DIR; gcfg.global_env = env; gcfg.c_callback = cblock_handle_request; From 4399fb81b499930f5c4730d762b49f7afc68d504 Mon Sep 17 00:00:00 2001 From: "Christian S.J. Peron" Date: Sat, 8 Nov 2025 01:56:02 -0600 Subject: [PATCH 2/4] printf var --- src/cblockd/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cblockd/main.c b/src/cblockd/main.c index ee2858d..4396ef8 100644 --- a/src/cblockd/main.c +++ b/src/cblockd/main.c @@ -237,6 +237,7 @@ main(int argc, char *argv [], char *env[]) char buf[32]; strcpy(buf, argv[1]); + (void) printf("TEST: %s\n", buf); gcfg.c_data_dir = DEFAULT_DATA_DIR; gcfg.global_env = env; gcfg.c_callback = cblock_handle_request; From f6647a1d23e5cac590ec38f2f28dc835a0e87f64 Mon Sep 17 00:00:00 2001 From: "Christian S.J. Peron" Date: Sat, 8 Nov 2025 02:08:31 -0600 Subject: [PATCH 3/4] use freebsd 14.2 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 429271e..e83a047 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,6 +3,6 @@ env: freebsd_14_task: freebsd_instance: - image: freebsd-14-3-release-amd64 + image: freebsd-14-2 build_script: ./build.sh From 9d13d9b88913282856f26a5b29e7241367688289 Mon Sep 17 00:00:00 2001 From: "Christian S.J. Peron" Date: Sat, 8 Nov 2025 02:10:18 -0600 Subject: [PATCH 4/4] Remove buffer overflow --- src/cblockd/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/cblockd/main.c b/src/cblockd/main.c index 4396ef8..ac6c5fc 100644 --- a/src/cblockd/main.c +++ b/src/cblockd/main.c @@ -234,10 +234,7 @@ main(int argc, char *argv [], char *env[]) int option_index, c, zfs_selected; pthread_t thr; char *r; - char buf[32]; - strcpy(buf, argv[1]); - (void) printf("TEST: %s\n", buf); gcfg.c_data_dir = DEFAULT_DATA_DIR; gcfg.global_env = env; gcfg.c_callback = cblock_handle_request;