Account for pOptionValue alignment in _socketSetSockOptLevelTransport (#208)

kstribrnAmzn · web-flow · commit 666d8d9e4d42 · 2026-03-31T15:48:54.000-07:00
* Fix _socketSetSockOptLevelTransport alignment issues

Copy value rather than casting to avoid
pointer alignment issues.

Other changes include: 
* Fix unit tests failing build
* Update link verifier to skip certain URLs
diff --git a/.github/allowed_urls.txt b/.github/allowed_urls.txt
@@ -0,0 +1,2 @@
+https://www.u-blox.com/en/product/sara-r4-series
+https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1515
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -138,6 +138,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main
+        with:
+          allowlist-file: '.github/allowed_urls.txt'
 
   verify-manifest:
     runs-on: ubuntu-latest
diff --git a/MISRA.md b/MISRA.md
@@ -75,15 +75,6 @@ _Ref 10.8.1_
   and isdigit. We do not have control over these so we are suppressing these
   violations.
 
-#### Rule 11.3
-
-_Ref 11.3.1_
-
-- MISRA C-2012 Rule 11.3 does not allow casting of a pointer to different object
-  types. We are passing in a length variable which is then checked to determine
-  what to cast this value to. As such we are not worried about the chance of
-  misaligned access when using the cast variable.
-
 #### Rule 21.6
 
 _Ref 21.6.1_
diff --git a/source/cellular_common_api.c b/source/cellular_common_api.c
@@ -67,17 +67,12 @@ static CellularError_t _socketSetSockOptLevelTransport( CellularSocketOption_t o
                                                         uint32_t optionValueLength )
 {
     CellularError_t cellularStatus = CELLULAR_SUCCESS;
-    const uint32_t * pTimeoutMs = NULL;
 
     if( option == CELLULAR_SOCKET_OPTION_SEND_TIMEOUT )
     {
         if( optionValueLength == sizeof( uint32_t ) )
         {
-            /* MISRA Ref 11.3 [Misaligned access] */
-            /* More details at: https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/main/MISRA.md#rule-113 */
-            /* coverity[misra_c_2012_rule_11_3_violation] */
-            pTimeoutMs = ( const uint32_t * ) pOptionValue;
-            socketHandle->sendTimeoutMs = *pTimeoutMs;
+            ( void ) memcpy( &( socketHandle->sendTimeoutMs ), pOptionValue, sizeof( uint32_t ) );
         }
         else
         {
@@ -88,11 +83,7 @@ static CellularError_t _socketSetSockOptLevelTransport( CellularSocketOption_t o
     {
         if( optionValueLength == sizeof( uint32_t ) )
         {
-            /* MISRA Ref 11.3 [Misaligned access] */
-            /* More details at: https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/main/MISRA.md#rule-113 */
-            /* coverity[misra_c_2012_rule_11_3_violation] */
-            pTimeoutMs = ( const uint32_t * ) pOptionValue;
-            socketHandle->recvTimeoutMs = *pTimeoutMs;
+            ( void ) memcpy( &( socketHandle->recvTimeoutMs ), pOptionValue, sizeof( uint32_t ) );
         }
         else
         {
@@ -116,10 +107,7 @@ static CellularError_t _socketSetSockOptLevelTransport( CellularSocketOption_t o
     {
         if( ( socketHandle->socketState == SOCKETSTATE_ALLOCATED ) && ( optionValueLength == sizeof( uint16_t ) ) )
         {
-            /* MISRA Ref 11.3 [Misaligned access] */
-            /* More details at: https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/main/MISRA.md#rule-113 */
-            /* coverity[misra_c_2012_rule_11_3_violation] */
-            socketHandle->localPort = *( ( uint16_t * ) pOptionValue );
+            ( void ) memcpy( &( socketHandle->localPort ), pOptionValue, sizeof( uint16_t ) );
         }
         else
         {
diff --git a/test/unit-test/cellular_pkthandler_utest.c b/test/unit-test/cellular_pkthandler_utest.c
@@ -86,7 +86,7 @@ CellularAtParseTokenMap_t CellularUrcHandlerTable[] =
     { "RDY",               cellularAtParseTokenHandler },
     { "RDY",               cellularAtParseTokenHandler }
 };
-const uint32_t CellularUrcHandlerTableSize = sizeof( CellularUrcHandlerTable ) / sizeof( CellularAtParseTokenMap_t );
+#define CellularUrcHandlerTableSize    ( sizeof( CellularUrcHandlerTable ) / sizeof( CellularAtParseTokenMap_t ) )
 
 CellularAtParseTokenMap_t CellularUrcHandlerTableWoParseFunc[] =
 {
@@ -101,7 +101,7 @@ CellularAtParseTokenMap_t CellularUrcHandlerTableWoParseFunc[] =
     { "QSIMSTAT",          NULL },
     { "RDY",               NULL }
 };
-const uint32_t CellularUrcHandlerTableWoParseFuncSize = sizeof( CellularUrcHandlerTableWoParseFunc ) / sizeof( CellularAtParseTokenMap_t );
+#define CellularUrcHandlerTableWoParseFuncSize    ( sizeof( CellularUrcHandlerTableWoParseFunc ) / sizeof( CellularAtParseTokenMap_t ) )
 
 CellularAtParseTokenMap_t CellularUrcHandlerTableSortFailCase[] =
 {
@@ -116,7 +116,7 @@ CellularAtParseTokenMap_t CellularUrcHandlerTableSortFailCase[] =
     { "QSIMSTAT",          NULL },
     { "RDY",               NULL }
 };
-const uint32_t CellularUrcHandlerTableSortFailCaseSize = sizeof( CellularUrcHandlerTableSortFailCase ) / sizeof( CellularAtParseTokenMap_t );
+#define CellularUrcHandlerTableSortFailCaseSize    ( sizeof( CellularUrcHandlerTableSortFailCase ) / sizeof( CellularAtParseTokenMap_t ) )
 
 CellularTokenTable_t tokenTable =
 {
diff --git a/test/unit-test/cellular_pktio_utest.c b/test/unit-test/cellular_pktio_utest.c
@@ -162,25 +162,25 @@ CellularAtParseTokenMap_t CellularUrcHandlerTable[] =
     { "QSIMSTAT",          NULL },
     { "RDY",               NULL }
 };
-const uint32_t CellularUrcHandlerTableSize = sizeof( CellularUrcHandlerTable ) / sizeof( CellularAtParseTokenMap_t );
+#define CellularUrcHandlerTableSize    ( sizeof( CellularUrcHandlerTable ) / sizeof( CellularAtParseTokenMap_t ) )
 
 const char * CellularSrcTokenErrorTable[] =
 { "ERROR", "BUSY", "NO CARRIER", "NO ANSWER", "NO DIALTONE", "ABORTED", "+CMS ERROR", "+CME ERROR", "SEND FAIL" };
-const uint32_t CellularSrcTokenErrorTableSize = sizeof( CellularSrcTokenErrorTable ) / sizeof( char * );
+#define CellularSrcTokenErrorTableSize    ( sizeof( CellularSrcTokenErrorTable ) / sizeof( char * ) )
 
 const char * CellularSrcTokenSuccessTable[] =
 { "OK", "CONNECT", "SEND OK", ">" };
-const uint32_t CellularSrcTokenSuccessTableSize = sizeof( CellularSrcTokenSuccessTable ) / sizeof( char * );
+#define CellularSrcTokenSuccessTableSize    ( sizeof( CellularSrcTokenSuccessTable ) / sizeof( char * ) )
 
 const char * CellularUrcTokenWoPrefixTable[] =
 { "NORMAL POWER DOWN", "PSM POWER DOWN", "RDY" };
 
-const uint32_t CellularUrcTokenWoPrefixTableSize = sizeof( CellularUrcTokenWoPrefixTable ) / sizeof( char * );
+#define CellularUrcTokenWoPrefixTableSize    ( sizeof( CellularUrcTokenWoPrefixTable ) / sizeof( char * ) )
 
 const char * CellularSrcExtraTokenSuccessTable[] =
 { "EXTRA_TOKEN_1", "EXTRA_TOKEN_2", "EXTRA_TOKEN_3" };
 
-const uint32_t CellularSrcExtraTokenSuccessTableSize = sizeof( CellularSrcExtraTokenSuccessTable ) / sizeof( char * );
+#define CellularSrcExtraTokenSuccessTableSize    ( sizeof( CellularSrcExtraTokenSuccessTable ) / sizeof( char * ) )
 
 CellularTokenTable_t tokenTable =
 {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+https://www.u-blox.com/en/product/sara-r4-series`
	`2`	`+https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1515`
Original file line number	Diff line number	Diff line change
`@@ -67,17 +67,12 @@ static CellularError_t _socketSetSockOptLevelTransport( CellularSocketOption_t o`
`67`	`67`	`uint32_t optionValueLength )`
`68`	`68`	`{`
`69`	`69`	`CellularError_t cellularStatus = CELLULAR_SUCCESS;`
`70`		`- const uint32_t * pTimeoutMs = NULL;`
`71`	`70`
`72`	`71`	`if( option == CELLULAR_SOCKET_OPTION_SEND_TIMEOUT )`
`73`	`72`	`{`
`74`	`73`	`if( optionValueLength == sizeof( uint32_t ) )`
`75`	`74`	`{`
`76`		`- /* MISRA Ref 11.3 [Misaligned access] */`
`77`		`- /* More details at: https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/main/MISRA.md#rule-113 */`
`78`		`- /* coverity[misra_c_2012_rule_11_3_violation] */`
`79`		`- pTimeoutMs = ( const uint32_t * ) pOptionValue;`
`80`		`- socketHandle->sendTimeoutMs = *pTimeoutMs;`
	`75`	`+ ( void ) memcpy( &( socketHandle->sendTimeoutMs ), pOptionValue, sizeof( uint32_t ) );`
`81`	`76`	`}`
`82`	`77`	`else`
`83`	`78`	`{`
`@@ -88,11 +83,7 @@ static CellularError_t _socketSetSockOptLevelTransport( CellularSocketOption_t o`
`88`	`83`	`{`
`89`	`84`	`if( optionValueLength == sizeof( uint32_t ) )`
`90`	`85`	`{`
`91`		`- /* MISRA Ref 11.3 [Misaligned access] */`
`92`		`- /* More details at: https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/main/MISRA.md#rule-113 */`
`93`		`- /* coverity[misra_c_2012_rule_11_3_violation] */`
`94`		`- pTimeoutMs = ( const uint32_t * ) pOptionValue;`
`95`		`- socketHandle->recvTimeoutMs = *pTimeoutMs;`
	`86`	`+ ( void ) memcpy( &( socketHandle->recvTimeoutMs ), pOptionValue, sizeof( uint32_t ) );`
`96`	`87`	`}`
`97`	`88`	`else`
`98`	`89`	`{`
`@@ -116,10 +107,7 @@ static CellularError_t _socketSetSockOptLevelTransport( CellularSocketOption_t o`
`116`	`107`	`{`
`117`	`108`	`if( ( socketHandle->socketState == SOCKETSTATE_ALLOCATED ) && ( optionValueLength == sizeof( uint16_t ) ) )`
`118`	`109`	`{`
`119`		`- /* MISRA Ref 11.3 [Misaligned access] */`
`120`		`- /* More details at: https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/blob/main/MISRA.md#rule-113 */`
`121`		`- /* coverity[misra_c_2012_rule_11_3_violation] */`
`122`		`- socketHandle->localPort = ( ( uint16_t ) pOptionValue );`
	`110`	`+ ( void ) memcpy( &( socketHandle->localPort ), pOptionValue, sizeof( uint16_t ) );`
`123`	`111`	`}`
`124`	`112`	`else`
`125`	`113`	`{`