From d9993409e0aba73d34daaa64ac4078fb9aeabb3b Mon Sep 17 00:00:00 2001 From: Niklas Eiling Date: Tue, 21 Mar 2023 12:26:13 +0100 Subject: [PATCH] fix possible NULL dereferencing in villasfpga_dma.c Signed-off-by: Niklas Eiling --- fpga/include/villas/fpga/{villasfpga_dma.h => dma.h} | 0 fpga/lib/CMakeLists.txt | 2 +- fpga/lib/{villasfpga_dma.cpp => dma.cpp} | 2 +- fpga/tests/unit/CMakeLists.txt | 2 +- fpga/tests/unit/{villasfpga_dma.c => dma.c} | 9 ++++++--- 5 files changed, 9 insertions(+), 6 deletions(-) rename fpga/include/villas/fpga/{villasfpga_dma.h => dma.h} (100%) rename fpga/lib/{villasfpga_dma.cpp => dma.cpp} (99%) rename fpga/tests/unit/{villasfpga_dma.c => dma.c} (93%) diff --git a/fpga/include/villas/fpga/villasfpga_dma.h b/fpga/include/villas/fpga/dma.h similarity index 100% rename from fpga/include/villas/fpga/villasfpga_dma.h rename to fpga/include/villas/fpga/dma.h diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt index 148d77867..f32da84a7 100644 --- a/fpga/lib/CMakeLists.txt +++ b/fpga/lib/CMakeLists.txt @@ -12,7 +12,7 @@ set(SOURCES core.cpp node.cpp utils.cpp - villasfpga_dma.cpp + dma.cpp ips/aurora_xilinx.cpp ips/aurora.cpp diff --git a/fpga/lib/villasfpga_dma.cpp b/fpga/lib/dma.cpp similarity index 99% rename from fpga/lib/villasfpga_dma.cpp rename to fpga/lib/dma.cpp index a1e6324b6..67014d67c 100644 --- a/fpga/lib/villasfpga_dma.cpp +++ b/fpga/lib/dma.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 *********************************************************************************/ -#include +#include #include #include diff --git a/fpga/tests/unit/CMakeLists.txt b/fpga/tests/unit/CMakeLists.txt index 454525714..6185b2e6d 100644 --- a/fpga/tests/unit/CMakeLists.txt +++ b/fpga/tests/unit/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(unit-tests-fpga PUBLIC ${CRITERION_LIBRARIES} ) -add_executable(villasfpga-dma villasfpga_dma.c) +add_executable(villasfpga-dma dma.c) target_include_directories(villasfpga-dma PUBLIC ../include diff --git a/fpga/tests/unit/villasfpga_dma.c b/fpga/tests/unit/dma.c similarity index 93% rename from fpga/tests/unit/villasfpga_dma.c rename to fpga/tests/unit/dma.c index 85d14ee18..5aede35c8 100644 --- a/fpga/tests/unit/villasfpga_dma.c +++ b/fpga/tests/unit/dma.c @@ -9,7 +9,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { @@ -21,7 +21,10 @@ int main(int argc, char *argv[]) float f; size_t size; - if (argc != 2 && argv != NULL) { + if (argv == NULL) { + return 1; + } + if (argc != 2 || argv[1] == NULL) { fprintf(stderr, "Usage: %s \n", argv[0]); } @@ -66,7 +69,7 @@ int main(int argc, char *argv[]) } printf("Enter a float:\n"); - if ((ret = scanf("%f", mem2ptr)) != 1) { + if ((ret = scanf("%f", (float*)mem2ptr)) != 1) { fprintf(stderr, "Failed to parse input: sscanf returned %d\n", ret); ret = 1; goto out;