From 4783578a536e507b7bfb9703019cc9cb5a2196a7 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Mon, 4 Jan 2021 10:46:21 -0500 Subject: [PATCH 1/4] Fix #228, Refactor UT_ClearForceFail to UT_ClearDefaultReturnValue --- .../mcp750-vxworks/src/coveragetest-cfe-psp-start.c | 4 ++-- .../shared/src/coveragetest-cfe-psp-exceptionstorage.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c index 7215153b..e7334288 100644 --- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c +++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c @@ -79,14 +79,14 @@ void Test_OS_Application_Startup(void) UT_SetDefaultReturnValue(UT_KEY(OS_API_Init), OS_ERROR); UT_OS_Application_Startup(); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(PCS_exit)), 1); - UT_ClearForceFail(UT_KEY(OS_API_Init)); + UT_ClearDefaultReturnValue(UT_KEY(OS_API_Init)); /* failure of OS_FileSysAddFixedMap - an extra OS_printf */ UT_SetDefaultReturnValue(UT_KEY(OS_FileSysAddFixedMap), OS_ERROR); UT_OS_Application_Startup(); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(OS_printf)), 9); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(PCS_SystemMain)), 2); - UT_ClearForceFail(UT_KEY(OS_FileSysAddFixedMap)); + UT_ClearDefaultReturnValue(UT_KEY(OS_FileSysAddFixedMap)); /* coverage for each of the reset types */ *PCS_SYS_REG_BLRR = PCS_SYS_REG_BLRR_PWRON; diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c index 7cad3ae1..81afe414 100644 --- a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c +++ b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c @@ -113,7 +113,7 @@ void Test_CFE_PSP_Exception_GetSummary(void) CFE_PSP_Exception_WriteComplete(); UT_SetDefaultReturnValue(UT_KEY(OS_TaskFindIdBySystemData), OS_ERROR); UtAssert_INT32_EQ(CFE_PSP_Exception_GetSummary(&LogId, &TaskId, ReasonBuf, sizeof(ReasonBuf)), CFE_PSP_SUCCESS); - UT_ClearForceFail(UT_KEY(OS_TaskFindIdBySystemData)); + UT_ClearDefaultReturnValue(UT_KEY(OS_TaskFindIdBySystemData)); UtAssert_NONZERO(LogId); UtAssert_ZERO(OS_ObjectIdToInteger(TaskId)); From c8dcf56112e7c7b664a6bd3fd5d5e1b4c9478594 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 6 Jan 2021 15:17:21 -0500 Subject: [PATCH 2/4] Fix #126, Refactor CFE_PSP_ModuleType_t enum Avoids irregular enum warning --- fsw/shared/inc/cfe_psp_module.h | 4 +--- fsw/shared/src/cfe_psp_module.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fsw/shared/inc/cfe_psp_module.h b/fsw/shared/inc/cfe_psp_module.h index 4690c792..a02628b9 100644 --- a/fsw/shared/inc/cfe_psp_module.h +++ b/fsw/shared/inc/cfe_psp_module.h @@ -36,10 +36,8 @@ typedef enum { CFE_PSP_MODULE_TYPE_INVALID = 0, - CFE_PSP_MODULE_TYPE_VALID_RANGE = 1000, - CFE_PSP_MODULE_TYPE_SIMPLE, + CFE_PSP_MODULE_TYPE_SIMPLE /* May be extended in the future */ - CFE_PSP_MODULE_TYPE_MAX } CFE_PSP_ModuleType_t; /** diff --git a/fsw/shared/src/cfe_psp_module.c b/fsw/shared/src/cfe_psp_module.c index 0ef5e3b4..f8f19892 100644 --- a/fsw/shared/src/cfe_psp_module.c +++ b/fsw/shared/src/cfe_psp_module.c @@ -65,8 +65,7 @@ void CFE_PSP_ModuleInit(void) while(Entry->Name != NULL) { ApiPtr = (CFE_PSP_ModuleApi_t *)Entry->Api; - if ((uint32)ApiPtr->ModuleType > CFE_PSP_MODULE_TYPE_VALID_RANGE && - (uint32)ApiPtr->ModuleType < CFE_PSP_MODULE_TYPE_MAX && + if ((uint32)ApiPtr->ModuleType == CFE_PSP_MODULE_TYPE_SIMPLE && ApiPtr->Init != NULL) { (*ApiPtr->Init)(CFE_PSP_MODULE_BASE | CFE_PSP_ModuleCount); From da990d4ba8e754d8d7a6a8954d9047c49146f1e0 Mon Sep 17 00:00:00 2001 From: Ariel Adams Date: Thu, 7 Jan 2021 12:02:16 -0600 Subject: [PATCH 3/4] Fix #236, Create Security Policy --- SECURITY.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..43d94643 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,15 @@ +# Security Policy + +## Reporting a Vulnerability + +To report a vulnerability for the PSP subsystem please [submit an issue](https://github.com/nasa/psp/issues/new/choose). + +For general cFS vulnerabilities please [open a cFS framework issue](https://github.com/nasa/cfs/issues/new/choose) and see our [top-level security policy](https://github.com/nasa/cFS/security/policy). + +In either case please use the "Bug Report" template and provide as much information as possible. Apply appropraite labels for each report. For security related reports, tag the issue with the "security" label. + +## Additional Support + +For additional support, email us at cfs-program@lists.nasa.gov. For help using OSAL and cFS, [subscribe to our mailing list](https://lists.nasa.gov/mailman/listinfo/cfs-community) that includes all the community members/users of the NASA core Flight Software (cFS) product line. The mailing list is used to communicate any information related to the cFS product such as current releases, bug findings and fixes, enhancement requests, community meeting notifications, sending out meeting minutes, etc. + +If you wish to report a cybersecurity incident or concern please contact the NASA Security Operations Center either by phone at 1-877-627-2732 or via email address soc@nasa.gov. From 064f62ba65cd7ff64c9b47d805be1ee296792d97 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 26 Jan 2021 19:40:13 -0500 Subject: [PATCH 4/4] Bump to v1.5.0-rc1+58 Update ReadMe --- README.md | 7 +++++++ fsw/mcp750-vxworks/inc/psp_version.h | 2 +- fsw/pc-linux/inc/psp_version.h | 2 +- fsw/pc-rtems/inc/psp_version.h | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 26b2430d..f5e28c1f 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,13 @@ This is a collection of APIs abstracting platform specific functionality to be l ## Version History +### Development Build: 1.5.0-rc1+dev58 + +- Add `Security.md` with instructions on reporting vulnerabilities. +- Rename `UT_ClearForceFail` as `UT_ClearDefaultValue` to reflect +- Remove unused elements in `CFE_PSP_ModuleType_t` enum to avoids irregular enum warning +- See + ### Development Build: 1.5.0-rc1+dev50 - Instead of accessing `OS_time_t` member values directly, use the OSAL-provided conversion and access methods. This provides independence and abstraction from the specific `OS_time_t` definition and allows OSAL to transition to a 64 bit value. diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index d018fde5..34ca70a6 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 50 +#define CFE_PSP_IMPL_BUILD_NUMBER 58 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1" /* diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index 9029b145..85cdb133 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 50 +#define CFE_PSP_IMPL_BUILD_NUMBER 58 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1" /* diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 53c56a14..3586186b 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 50 +#define CFE_PSP_IMPL_BUILD_NUMBER 58 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1" /*