Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cFS Bundle Integration candidate: 2021-01-19 #177

Merged
merged 5 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: "CodeQL Configuration File"

queries:
- uses: security-and-quality
- uses: security-extended
59 changes: 59 additions & 0 deletions .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: "CodeQL Analysis"

on:
push:
branches:
- main
pull_request:

env:
SIMULATION: native
ENABLE_UNIT_TESTS: true
OMIT_DEPRECATED: true

jobs:

CodeQL-Build:

strategy:
matrix:
buildtype: [debug, release]

runs-on: ubuntu-18.04
env:
BUILDTYPE: ${{ matrix.buildtype }}
steps:
# Checks out a copy of your repository on the ubuntu-latest machine
- name: Checkout code
uses: actions/checkout@v2
with:
submodules: true

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: c
config-file: ./.github/codeql/codeql-config.yml

# Setup the build system
- name: Copy sample_defs
run: |
cp ./cfe/cmake/Makefile.sample Makefile
cp -r ./cfe/cmake/sample_defs sample_defs

# Setup the build system
- name: Make Install
run: make install

- name: List cpu1
run: ls build/exe/cpu1/

- name: Run cFS
run: |
./core-cpu1 > cFS_startup_cpu1.txt &
sleep 30
../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
working-directory: ./build/exe/cpu1/

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
13 changes: 13 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security Policy

## Reporting a Vulnerability

For general cFS vulnerabilities please [open a cFS framework issue](https://github.com/nasa/cfs/issues/new/choose).

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 [email protected]. 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 [email protected].
2 changes: 1 addition & 1 deletion apps/ci_lab
Submodule ci_lab updated 1 files
+15 −0 SECURITY.md
2 changes: 1 addition & 1 deletion apps/sample_lib
Submodule sample_lib updated 1 files
+15 −0 SECURITY.md
2 changes: 1 addition & 1 deletion apps/sch_lab
Submodule sch_lab updated 1 files
+15 −0 SECURITY.md
2 changes: 1 addition & 1 deletion apps/to_lab
Submodule to_lab updated 1 files
+15 −0 SECURITY.md
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 56 files
+34 −0 README.md
+16 −0 SECURITY.md
+0 −43 cmake/sample_defs/cpu1_platform_cfg.h
+1 −1 cmake/sample_defs/sample_perfids.h
+4 −4 cmake/sample_defs/targets.cmake
+16 −13 fsw/cfe-core/src/es/cfe_es_api.c
+10 −2 fsw/cfe-core/src/es/cfe_es_apps.c
+14 −2 fsw/cfe-core/src/es/cfe_es_cds.c
+14 −0 fsw/cfe-core/src/es/cfe_es_cds.h
+2 −1 fsw/cfe-core/src/es/cfe_es_erlog.c
+1 −0 fsw/cfe-core/src/es/cfe_es_log.h
+14 −2 fsw/cfe-core/src/es/cfe_es_mempool.c
+27 −1 fsw/cfe-core/src/es/cfe_es_mempool.h
+43 −24 fsw/cfe-core/src/es/cfe_es_resource.c
+7 −115 fsw/cfe-core/src/es/cfe_es_resource.h
+2 −1 fsw/cfe-core/src/es/cfe_es_start.c
+3 −12 fsw/cfe-core/src/es/cfe_es_task.c
+5 −3 fsw/cfe-core/src/es/cfe_es_task.h
+1 −102 fsw/cfe-core/src/inc/cfe_es.h
+4 −12 fsw/cfe-core/src/inc/cfe_es_events.h
+150 −0 fsw/cfe-core/src/inc/cfe_resourceid.h
+35 −1 fsw/cfe-core/src/inc/cfe_sb.h
+32 −2 fsw/cfe-core/src/inc/cfe_sb_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+165 −0 fsw/cfe-core/src/inc/private/cfe_resourceid_internal.h
+1,184 −801 fsw/cfe-core/src/sb/cfe_sb_api.c
+35 −11 fsw/cfe-core/src/sb/cfe_sb_buf.c
+6 −13 fsw/cfe-core/src/sb/cfe_sb_init.c
+64 −131 fsw/cfe-core/src/sb/cfe_sb_priv.c
+113 −21 fsw/cfe-core/src/sb/cfe_sb_priv.h
+286 −101 fsw/cfe-core/src/sb/cfe_sb_task.c
+0 −8 fsw/cfe-core/src/sb/cfe_sb_verify.h
+17 −10 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+6 −4 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+1 −7 fsw/cfe-core/src/tbl/cfe_tbl_task.c
+0 −2 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+6 −2 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+13 −14 fsw/cfe-core/src/time/cfe_time_api.c
+1 −3 fsw/cfe-core/src/time/cfe_time_task.c
+1 −1 fsw/cfe-core/src/time/cfe_time_tone.c
+0 −3 fsw/cfe-core/src/time/cfe_time_utils.c
+0 −3 fsw/cfe-core/src/time/cfe_time_utils.h
+215 −211 fsw/cfe-core/unit-test/es_UT.c
+76 −54 fsw/cfe-core/unit-test/evs_UT.c
+2 −2 fsw/cfe-core/unit-test/fs_UT.c
+247 −173 fsw/cfe-core/unit-test/sb_UT.c
+0 −17 fsw/cfe-core/unit-test/sb_UT.h
+210 −163 fsw/cfe-core/unit-test/tbl_UT.c
+2 −0 fsw/cfe-core/unit-test/ut_osprintf_stubs.c
+2 −0 fsw/cfe-core/unit-test/ut_osprintf_stubs.h
+2 −1 fsw/cfe-core/unit-test/ut_support.c
+0 −17 fsw/cfe-core/unit-test/ut_support.h
+61 −0 fsw/cfe-core/ut-stubs/ut_es_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+1 −0 modules/msg/mission_inc/default_cfe_msg_hdr_pri.h
+1 −0 modules/msg/mission_inc/default_cfe_msg_hdr_priext.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 48 files
+19 −0 README.md
+15 −0 SECURITY.md
+41 −37 src/os/inc/osapi-clock.h
+11 −0 src/os/inc/osapi-filesys.h
+1 −1 src/os/inc/osapi-version.h
+5 −0 src/os/inc/osapi.h
+4 −0 src/os/shared/src/osapi-filesys.c
+12 −2 src/tests/file-api-test/file-api-test.c
+24 −5 src/tests/network-api-test/network-api-test.c
+93 −16 src/tests/queue-test/queue-test.c
+19 −13 src/tests/select-test/select-test.c
+4 −4 src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-binsem.c
+6 −6 src/unit-test-coverage/shared/src/coveragetest-clock.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-countsem.c
+3 −3 src/unit-test-coverage/shared/src/coveragetest-file.c
+7 −84 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-idmap.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-mutex.c
+2 −2 src/unit-test-coverage/shared/src/coveragetest-queue.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-select.c
+1 −1 src/unit-test-coverage/shared/src/coveragetest-sockets.c
+3 −3 src/unit-test-coverage/shared/src/coveragetest-task.c
+11 −11 src/unit-test-coverage/shared/src/coveragetest-time.c
+2 −2 src/unit-test-coverage/shared/src/coveragetest-timebase.c
+1 −1 src/unit-test-coverage/vxworks/src/coveragetest-common.c
+2 −2 src/unit-test-coverage/vxworks/src/coveragetest-console.c
+5 −5 src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
+1 −1 src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
+4 −4 src/unit-test-coverage/vxworks/src/coveragetest-loader.c
+4 −4 src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
+3 −3 src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
+1 −1 src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
+2 −2 src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
+2 −1 src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+0 −217 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.c
+0 −2 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.h
+0 −2 src/unit-tests/osfilesys-test/ut_osfilesys_test.c
+3 −0 src/unit-tests/osloader-test/CMakeLists.txt
+4 −0 src/ut-stubs/osapi-utstub-filesys.c
+8 −0 src/ut-stubs/osapi-utstub-printf.c
+0 −23 src/ut-stubs/utstub-helpers.c
+0 −6 src/ut-stubs/utstub-helpers.h
+15 −9 ut_assert/inc/utstubs.h
+5 −0 ut_assert/inc/uttest.h
+2 −1 ut_assert/src/utassert.c
+1 −0 ut_assert/src/utbsp.c
+15 −10 ut_assert/src/utstubs.c
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
2 changes: 1 addition & 1 deletion tools/elf2cfetbl
Submodule elf2cfetbl updated 1 files
+15 −0 SECURITY.md
2 changes: 1 addition & 1 deletion tools/tblCRCTool