merge: Merge branch 'develop' into feature/more_hardening

Signed-off-by: Tyler Erickson <tyler.erickson@seagate.com>

# Conflicts:
#	meson.build
#	utils/C/openSeaChest/openSeaChest_Defect.c
#	utils/C/openSeaChest/openSeaChest_PowerControl.c

Author: vonericsen

.github/workflows/meson.yml

@@ -4,7 +4,7 @@ name: CI for meson build
 on:
   push:
     branches: [ develop, master, release/*, feature/*, hotfix/* ]
-    tags: [ v* ]
+    tags: [ v*, test-ci* ]
   pull_request:
     branches: [ develop ]
 
@@ -223,7 +223,35 @@ jobs:
       if: startsWith(matrix.config.name, 'Windows Clang')
       run: |
         $headers = @{ Authorization = 'Bearer ${{ secrets.GITHUB_TOKEN }}' }
-        echo "LLVM_RELID=$((Invoke-WebRequest -Headers $headers 'https://api.github.com/repos/llvm/llvm-project/releases/latest').Content | ConvertFrom-Json | Select-Object -ExpandProperty id)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        $latestRelease = Invoke-WebRequest -Headers $headers 'https://api.github.com/repos/llvm/llvm-project/releases/latest'
+        $releaseData = $latestRelease.Content | ConvertFrom-Json
+        $assets = $releaseData.assets | Where-Object { $_.name -like "*win64.exe" }
+        
+        if ($assets) {
+          $downloadUrl = $assets.browser_download_url
+          echo "LLVM_RELID=$($releaseData.id)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "LLVM_DOWNLOAD_URL=$downloadUrl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        } else {
+          Write-Host "No current Windows build available for the latest release. Searching for previous releases..."
+          $releases = Invoke-WebRequest -Headers $headers 'https://api.github.com/repos/llvm/llvm-project/releases'
+          $found = $false
+          
+          foreach ($release in $releases.Content | ConvertFrom-Json) {
+            $assets = $release.assets | Where-Object { $_.name -like "*win64.exe" }
+            if ($assets) {
+              $downloadUrl = $assets.browser_download_url
+              echo "LLVM_RELID=$($release.id)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+              echo "LLVM_DOWNLOAD_URL=$downloadUrl" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+              $found = $true
+              break
+            }
+          }
+          
+          if (-not $found) {
+            Write-Host "No Windows build available for any recent releases."
+            exit 0
+          }
+        }
 
     - name: Restore LLVM from cache
       if: startsWith(matrix.config.name, 'Windows Clang')
@@ -260,14 +288,6 @@ jobs:
         meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
         meson install -C build
 
-    - name: Packing release
-      env:
-        ARCHIVE_EXT: ${{ matrix.config.release_extension }}
-      run: |
-        cd build
-        ${{ matrix.config.archive_command }} "${DESTDIR}${ARCHIVE_EXT}" $DESTDIR
-      shell: bash
-
     # add `GOBIN` to the `PATH` otherwise nfpm in next step can't be found
     - uses: actions/setup-go@v5
       if: ${{ matrix.config.create_package }}
@@ -290,6 +310,26 @@ jobs:
         nfpm package -f ../../nfpm.yaml -p rpm -t ..
       shell: bash
 
+    - name: Set ownership of executables to root:root
+      if: ${{ matrix.config.os != 'windows-latest' }}
+      run: sudo chown -R root:root build
+
+    - name: Packing release
+      env:
+        ARCHIVE_EXT: ${{ matrix.config.release_extension }}
+      run: |
+        cd build
+        if [[ "${{ matrix.config.os }}" != "windows-latest" ]]; then
+          sudo ${{ matrix.config.archive_command }} "${DESTDIR}${ARCHIVE_EXT}" $DESTDIR
+        else
+          ${{ matrix.config.archive_command }} "${DESTDIR}${ARCHIVE_EXT}" $DESTDIR
+        fi
+      shell: bash
+
+    - name: Set ownership of tar archive to root:root
+      if: ${{ matrix.config.os != 'windows-latest' }}
+      run: sudo chown root:root build/"${DESTDIR}${ARCHIVE_EXT}"
+
     - name: Generate Hashes
       if: ${{ matrix.config.publish_release }}
       shell: bash
@@ -314,7 +354,7 @@ jobs:
           build/*.rpm
 
     - name: Publish release
-      if: ${{ startsWith(github.ref, 'refs/tags/v') && matrix.config.publish_release }}
+      if: ${{ (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/test-ci')) && matrix.config.publish_release }}
       uses: softprops/action-gh-release@v2
       with:
         files: |

meson.build

@@ -37,7 +37,6 @@ if c.get_id().contains('gcc') or c.get_id().contains('clang')
   '-Wundef',
   '-Wformat',
   '-Wformat=2',
-  '-Wsign-conversion',
   '-Wint-conversion',#-Warith-conversion
   '-Wenum-conversion',
   '-Wfloat-conversion',
@@ -79,6 +78,11 @@ if c.get_id().contains('gcc') or c.get_id().contains('clang')
   '-fvisibility=hidden', #to work similarly to Window's DLL import/export
   ]
 
+  if c.get_id().contains('gcc') and c.version().version_compare('>=10.0')
+    #only enable the sign conversion warning on versions 10 and up because it is way too noisy on earlier GCC versions than it is useful-TJE
+    warning_flags += '-Wsign-conversion'
+  endif
+
   if c.get_id().contains('gcc') and target_machine.system() == 'windows'
     #According to the link below, this is not needed in Windows...it also causes a bug in some versions of GCC for Windows.
     #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90458
@@ -105,6 +109,15 @@ if c.get_id().contains('gcc') or c.get_id().contains('clang')
     '-Wl,-z,relro',
     '-Wl,-z,now'
   ]
+  fortifytest = ''' #include <stdio.h>
+                      int main() {
+                          return 0;
+                      }
+                  '''
+  fortifyresult = c.compiles(fortifytest, name : '_FORTIFY_SOURCE override', args : ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=5', '-Werror'])
+  if fortifyresult == true
+    warning_flags += ['-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=3']
+  endif
 elif c.get_id().contains('msvc')
   #See here for enabling/disabling msvc warnings:
   #https://learn.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level?view=msvc-170
@@ -167,7 +180,6 @@ elif c.get_id().contains('msvc')
     '/we4628', # digraphs not supported with -Ze. Character sequence 'digraph' not interpreted as alternate token for 'char'
     '/we4289', # nonstandard extension used : 'var' : loop control variable declared in the for-loop is used outside the for-loop scope
     '/we4464', # relative include path contains '..'
-    '/std:c17', #NOTE: It would be better to specify for the project settings above for all compilers, but currently still supporting MSVC and GCC compilers that may not be C11 compatible.-TJE
     '/GS', #security cookie for stack protection
     '/sdl', #adds recommended security development lifecycle checks
     '/Qspectre',
@@ -179,6 +191,10 @@ elif c.get_id().contains('msvc')
     # https://learn.microsoft.com/en-us/cpp/build/reference/qintel-jcc-erratum?view=msvc-170
     warning_flags += '/QIntel-jcc-erratum'
   endif
+  
+  if c.has_argument('/std:c17')
+    c_std = 'c17'
+  endif
 
   linker_flags += [
     '/guard:cf', #control flow guard
@@ -219,9 +235,18 @@ if (c.get_id() == 'gcc' or c.get_id() == 'clang') and target_machine.system() !=
   #skipping sunos since this was a compatibility issue that was reported earlier. May be able to find a better way to handle this in the future.
   if not (target_machine.system() == 'sunos') and c.get_id().contains('gcc')
     if c.version().version_compare('<5.0')
-      if c.has_argument('-std=gnu99')
+    #4.7.4+ has C11 support, but c89 is the default standard so we need to change it.
+      if c.has_argument('-std=gnu11')
+        c_std = 'gnu11'
+        if meson.version().version_compare('<1.0.0')
+          add_project_arguments('-std=gnu11', language : 'c')
+        endif
+      elif c.has_argument('-std=gnu99')
         #Add this argument to the list since C99 is a minimum required C compiler standard
-        add_global_arguments('-std=gnu99', language: 'c',)
+        c_std = 'gnu99'
+        if meson.version().version_compare('<1.0.0')
+          add_project_arguments('-std=gnu99', language : 'c')
+        endif
       else
         error('C99/GNU99 standard is required but was not able to be set!')
       endif
@@ -284,6 +309,11 @@ opensea_common_dep = opensea_common.get_variable('opensea_common_dep')
 opensea_transport = subproject('opensea-transport')
 opensea_transport_dep = opensea_transport.get_variable('opensea_transport_dep')
 
+csmisupport = opensea_transport.get_variable('csmisupport')
+if csmisupport.enabled()
+  add_project_arguments('-DENABLE_CSMI', language : 'c')
+endif
+
 opensea_operations = subproject('opensea-operations')
 opensea_operations_dep = opensea_operations.get_variable('opensea_operations_dep')
 

src/openseachest_util_options.c

@@ -5354,7 +5354,7 @@ void print_Check_Grown_List_Help(bool shortHelp)
 
 void print_Show_Pending_List_Help(bool shortHelp)
 {
-    printf("\t--%s (Seagate Only)\n", SHOW_PENDING_LIST_LONG_OPT_STRING);
+    printf("\t--%s\n", SHOW_PENDING_LIST_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to show the pending defect list\n");
@@ -5365,7 +5365,7 @@ void print_Show_Pending_List_Help(bool shortHelp)
 
 void print_Create_Uncorrectable_Help(bool shortHelp)
 {
-    printf("\t--%s [lba]\t(Seagate Only)\n", CREATE_UNCORRECTABLE_LONG_OPT_STRING);
+    printf("\t--%s [lba]\n", CREATE_UNCORRECTABLE_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to create a uncorrectable error at\n");
@@ -5379,7 +5379,7 @@ void print_Create_Uncorrectable_Help(bool shortHelp)
 
 void print_Flag_Uncorrectable_Help(bool shortHelp)
 {
-    printf("\t--%s\t(Seagate Only)\n", FLAG_UNCORRECTABLE_LONG_OPT_STRING);
+    printf("\t--%s\n", FLAG_UNCORRECTABLE_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to flag an uncorrectable error instead of\n");
@@ -5397,7 +5397,7 @@ void print_Flag_Uncorrectable_Help(bool shortHelp)
 
 void print_Uncorrectable_Range_Help(bool shortHelp)
 {
-    printf("\t--%s [range]\t(Seagate Only)\n", UNCORRECTABLE_RANGE_LONG_OPT_STRING);
+    printf("\t--%s [range]\n", UNCORRECTABLE_RANGE_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to specify a range of LBAs to create an\n");
@@ -5410,7 +5410,7 @@ void print_Uncorrectable_Range_Help(bool shortHelp)
 
 void print_Random_Uncorrectable_Help(bool shortHelp)
 {
-    printf("\t--%s [number of errors]\t(Seagate Only)\n", RANDOM_UNCORRECTABLES_LONG_OPT_STRING);
+    printf("\t--%s [number of errors]\n", RANDOM_UNCORRECTABLES_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to create a number of random uncorrectable\n");
@@ -5433,7 +5433,7 @@ void print_Disable_Read_Uncorrectables_Help(bool shortHelp)
 
 void print_Corrupt_LBA_Help(bool shortHelp)
 {
-    printf("\t--%s [lba]\t(Seagate Only)\n", CORRUPT_LBA_LONG_OPT_STRING);
+    printf("\t--%s [lba]\n", CORRUPT_LBA_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to corrupt the data bytes of an LBA. The\n");
@@ -5448,7 +5448,7 @@ void print_Corrupt_LBA_Help(bool shortHelp)
 
 void print_Corrupt_Random_LBAs_Help(bool shortHelp)
 {
-    printf("\t--%s [# of LBAs to corrupt]\t(Seagate Only)\n", CORRUPT_RANDOM_LBAS_LONG_OPT_STRING);
+    printf("\t--%s [# of LBAs to corrupt]\n", CORRUPT_RANDOM_LBAS_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tThis option will corrupt the specified number of LBAs randomly\n");
@@ -5464,7 +5464,7 @@ void print_Corrupt_Random_LBAs_Help(bool shortHelp)
 
 void print_Corrupt_Range_Help(bool shortHelp)
 {
-    printf("\t--%s [# of LBAs]\t(Seagate Only)\n", CORRUPT_LBA_RANGE_LONG_OPT_STRING);
+    printf("\t--%s [# of LBAs]\n", CORRUPT_LBA_RANGE_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tThis option is used with the --%s option to\n", CORRUPT_LBA_LONG_OPT_STRING);
@@ -5474,7 +5474,7 @@ void print_Corrupt_Range_Help(bool shortHelp)
 
 void print_Bytes_To_Corrupt_Help(bool shortHelp)
 {
-    printf("\t--%s [# of bytes]\t(Seagate Only)\n", BYTES_TO_CORRUPT_LONG_OPT_STRING);
+    printf("\t--%s [# of bytes]\n", BYTES_TO_CORRUPT_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tUse this option to specify the number of data bytes to change\n");
@@ -5484,7 +5484,7 @@ void print_Bytes_To_Corrupt_Help(bool shortHelp)
 
 void print_SCSI_FW_Info_Help(bool shortHelp)
 {
-    printf("\t--%s (SAS Only)\n", SHOW_SCSI_FW_INFO_LONG_OPT_STRING);
+    printf("\t--%s (SAS Only) (Seagate Only)\n", SHOW_SCSI_FW_INFO_LONG_OPT_STRING);
     if (!shortHelp)
     {
         printf("\t\tThis option will show the SCSI Firmware info from\n");

utils/C/openSeaChest/openSeaChest_Defect.c

@@ -34,8 +34,8 @@
 ////////////////////////
 //  Global Variables  //
 ////////////////////////
-const char* util_name    = "openSeaChest_Defect";
-const char* buildVersion = "0.9.0";
+const char* util_name = "openSeaChest_Defect";
+const char* buildVersion = "0.9.1";
 
 ////////////////////////////
 //  functions to declare  //
@@ -1707,10 +1707,11 @@ void utility_Usage(bool shortUsage)
     print_SCSI_Defects_Format_Help(shortUsage);
     print_SCSI_Defects_Help(shortUsage);
 
-    // data destructive commands - alphabetized
-    printf("Data Destructive Commands (Seagate only)\n");
-    printf("========================================\n");
-    // utility data destructive tests/operations go here
+
+    //data destructive commands - alphabetized
+    printf("Data Destructive Commands\n");
+    printf("=========================\n");
+    //utility data destructive tests/operations go here
     print_Bytes_To_Corrupt_Help(shortUsage);
     print_DST_And_Clean_Help(shortUsage);
     print_Corrupt_LBA_Help(shortUsage);

utils/C/openSeaChest/openSeaChest_PowerControl.c

@@ -34,8 +34,8 @@
 ////////////////////////
 //  Global Variables  //
 ////////////////////////
-const char* util_name    = "openSeaChest_PowerControl";
-const char* buildVersion = "3.6.0";
+const char *util_name = "openSeaChest_PowerControl";
+const char *buildVersion = "3.6.1";
 
 ////////////////////////////
 //  functions to declare  //

utils/C/openSeaChest/openSeaChest_Security.c

@@ -463,7 +463,7 @@ int main(int argc, char* argv[])
             }
             else if (strcmp(longopts[optionIndex].name, ATA_SECURITY_MASTER_PW_ID_LONG_OPT_STRING) == 0)
             {
-                if (!get_And_Validate_Integer_Input_Uint16(optarg, M_NULLPTR, &ATA_SECURITY_MASTER_PW_ID))
+                if (!get_And_Validate_Integer_Input_Uint16(optarg, M_NULLPTR, ALLOW_UNIT_NONE, &ATA_SECURITY_MASTER_PW_ID))
                 {
                     print_Error_In_Cmd_Line_Args(ATA_SECURITY_MASTER_PW_ID_LONG_OPT_STRING, optarg);
                     exit(UTIL_EXIT_ERROR_IN_COMMAND_LINE);