Skip to content

Commit 4e3ba1b

Browse files
tony-josi-awstony-josi-aws
authored
Merge branch 'main' into stm32-networkinterface-bugfixes
2 parents 0cdb485 + 90d88d7 commit 4e3ba1b

39 files changed

Lines changed: 579 additions & 154 deletions

File tree

‎source/FreeRTOS_DNS_Parser.c‎

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -486,31 +486,30 @@
486486
LLMNRAnswer_t * pxAnswer;
487487
uint8_t * pucNewBuffer = NULL;
488488
size_t uxExtraLength;
489+
size_t uxDataLength = uxBufferLength +
490+
sizeof( UDPHeader_t ) +
491+
sizeof( EthernetHeader_t ) +
492+
uxIPHeaderSizePacket( pxNetworkBuffer );
489493

490-
if( xBufferAllocFixedSize == pdFALSE )
491-
{
492-
size_t uxDataLength = uxBufferLength +
493-
sizeof( UDPHeader_t ) +
494-
sizeof( EthernetHeader_t ) +
495-
uxIPHeaderSizePacket( pxNetworkBuffer );
496-
497-
#if ( ipconfigUSE_IPv6 != 0 )
498-
if( xSet.usType == dnsTYPE_AAAA_HOST )
499-
{
500-
uxExtraLength = sizeof( LLMNRAnswer_t ) + ipSIZE_OF_IPv6_ADDRESS - sizeof( pxAnswer->ulIPAddress );
501-
}
502-
else
503-
#endif /* ( ipconfigUSE_IPv6 != 0 ) */
504-
#if ( ipconfigUSE_IPv4 != 0 )
505-
{
506-
uxExtraLength = sizeof( LLMNRAnswer_t );
507-
}
508-
#else /* ( ipconfigUSE_IPv4 != 0 ) */
494+
#if ( ipconfigUSE_IPv6 != 0 )
495+
if( xSet.usType == dnsTYPE_AAAA_HOST )
509496
{
510-
/* do nothing, coverity happy */
497+
uxExtraLength = sizeof( LLMNRAnswer_t ) + ipSIZE_OF_IPv6_ADDRESS - sizeof( pxAnswer->ulIPAddress );
511498
}
512-
#endif /* ( ipconfigUSE_IPv4 != 0 ) */
499+
else
500+
#endif /* ( ipconfigUSE_IPv6 != 0 ) */
501+
#if ( ipconfigUSE_IPv4 != 0 )
502+
{
503+
uxExtraLength = sizeof( LLMNRAnswer_t );
504+
}
505+
#else /* ( ipconfigUSE_IPv4 != 0 ) */
506+
{
507+
/* do nothing, coverity happy */
508+
}
509+
#endif /* ( ipconfigUSE_IPv4 != 0 ) */
513510

511+
if( xBufferAllocFixedSize == pdFALSE )
512+
{
514513
/* Set the size of the outgoing packet. */
515514
pxNetworkBuffer->xDataLength = uxDataLength;
516515
pxNewBuffer = pxDuplicateNetworkBufferWithDescriptor( pxNetworkBuffer,
@@ -539,7 +538,17 @@
539538
}
540539
else
541540
{
542-
pucNewBuffer = &( pxNetworkBuffer->pucEthernetBuffer[ uxUDPOffset ] );
541+
/* When xBufferAllocFixedSize is TRUE, check if the buffer size is big enough to
542+
* store the answer. */
543+
if( ( uxDataLength + uxExtraLength ) <= ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER )
544+
{
545+
pucNewBuffer = &( pxNetworkBuffer->pucEthernetBuffer[ uxUDPOffset ] );
546+
}
547+
else
548+
{
549+
/* Just to indicate that the message may not be answered. */
550+
pxNetworkBuffer = NULL;
551+
}
543552
}
544553

545554
if( ( pxNetworkBuffer != NULL ) )
@@ -1214,7 +1223,11 @@
12141223
{
12151224
/* BufferAllocation_1.c is used, the Network Buffers can contain at least
12161225
* ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER. */
1217-
configASSERT( uxSizeNeeded < ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER );
1226+
if( uxSizeNeeded > ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) )
1227+
{
1228+
/* The buffer is too small to reply. Drop silently. */
1229+
break;
1230+
}
12181231
}
12191232

12201233
pxNetworkBuffer->xDataLength = uxSizeNeeded;

‎source/include/NetworkInterface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
*/
4949

5050
/* The following function is defined only when BufferAllocation_1.c is linked in the project. */
51-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] );
51+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] );
5252

5353
BaseType_t xGetPhyLinkStatus( struct xNetworkInterface * pxInterface );
5454

‎source/portable/BufferManagement/BufferAllocation_1.c‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ static NetworkBufferDescriptor_t xNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DES
7070
* packet. No resizing will be done. */
7171
const BaseType_t xBufferAllocFixedSize = pdTRUE;
7272

73+
static size_t uxMaxNetworkInterfaceAllocatedSizeBytes;
74+
7375
/* The semaphore used to obtain network buffers. */
7476
static SemaphoreHandle_t xNetworkBufferSemaphore = NULL;
7577

@@ -201,7 +203,10 @@ BaseType_t xNetworkBuffersInitialise( void )
201203
/* Initialise all the network buffers. The buffer storage comes
202204
* from the network interface, and different hardware has different
203205
* requirements. */
204-
vNetworkInterfaceAllocateRAMToBuffers( xNetworkBuffers );
206+
uxMaxNetworkInterfaceAllocatedSizeBytes = uxNetworkInterfaceAllocateRAMToBuffers( xNetworkBuffers );
207+
208+
/* The allocated buffer should hold atleast ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER bytes */
209+
configASSERT( ( uxMaxNetworkInterfaceAllocatedSizeBytes >= ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) ) );
205210

206211
for( x = 0U; x < ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS; x++ )
207212
{
@@ -237,11 +242,8 @@ NetworkBufferDescriptor_t * pxGetNetworkBufferWithDescriptor( size_t xRequestedS
237242
BaseType_t xInvalid = pdFALSE;
238243
UBaseType_t uxCount;
239244

240-
/* The current implementation only has a single size memory block, so
241-
* the requested size parameter is not used (yet). */
242-
( void ) xRequestedSizeBytes;
243-
244-
if( xNetworkBufferSemaphore != NULL )
245+
if( ( xNetworkBufferSemaphore != NULL ) &&
246+
( xRequestedSizeBytes <= uxMaxNetworkInterfaceAllocatedSizeBytes ) )
245247
{
246248
/* If there is a semaphore available, there is a network buffer
247249
* available. */
@@ -432,10 +434,18 @@ UBaseType_t uxGetNumberOfFreeNetworkBuffers( void )
432434
NetworkBufferDescriptor_t * pxResizeNetworkBufferWithDescriptor( NetworkBufferDescriptor_t * pxNetworkBuffer,
433435
size_t xNewSizeBytes )
434436
{
435-
/* In BufferAllocation_1.c all network buffer are allocated with a
436-
* maximum size of 'ipTOTAL_ETHERNET_FRAME_SIZE'.No need to resize the
437-
* network buffer. */
438-
pxNetworkBuffer->xDataLength = xNewSizeBytes;
437+
if( xNewSizeBytes <= uxMaxNetworkInterfaceAllocatedSizeBytes )
438+
{
439+
/* In BufferAllocation_1.c all network buffer are allocated with a
440+
* maximum size of 'ipTOTAL_ETHERNET_FRAME_SIZE'.No need to resize the
441+
* network buffer. */
442+
pxNetworkBuffer->xDataLength = xNewSizeBytes;
443+
}
444+
else
445+
{
446+
pxNetworkBuffer = NULL;
447+
}
448+
439449
return pxNetworkBuffer;
440450
}
441451

‎source/portable/NetworkInterface/ATSAME5x/NetworkInterface.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,9 +499,10 @@ void xRxCallback( void )
499499

500500
#if ( ipUSE_STATIC_ALLOCATION == 1 )
501501

502-
/* Next provide the vNetworkInterfaceAllocateRAMToBuffers() function, which
503-
* simply fills in the pucEthernetBuffer member of each descriptor. */
504-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
502+
/* Next provide the uxNetworkInterfaceAllocateRAMToBuffers() function, which
503+
* simply fills in the pucEthernetBuffer member of each descriptor and returns
504+
* the allocated buffer size. */
505+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
505506
{
506507
BaseType_t x;
507508

@@ -515,6 +516,8 @@ void xRxCallback( void )
515516
* future versions. */
516517
*( ( uint32_t * ) &ucBuffers[ x ][ 0 ] ) = ( uint32_t ) &( pxNetworkBuffers[ x ] );
517518
}
519+
520+
return( NETWORK_BUFFER_SIZE - ipBUFFER_PADDING );
518521
}
519522
#endif /* if ( ipUSE_STATIC_ALLOCATION == 1 ) */
520523

‎source/portable/NetworkInterface/DriverSAM/NetworkInterface.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ static void vCheckBuffersAndQueue( void )
14091409
/*-----------------------------------------------------------*/
14101410

14111411
extern uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * NETWORK_BUFFER_SIZE ];
1412-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
1412+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
14131413
{
14141414
uint8_t * ucRAMBuffer = ucNetworkPackets;
14151415
uint32_t ulIndex;
@@ -1422,6 +1422,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB
14221422
}
14231423

14241424
cache_clean_invalidate();
1425+
1426+
return( NETWORK_BUFFER_SIZE - ipBUFFER_PADDING );
14251427
}
14261428
/*-----------------------------------------------------------*/
14271429

‎source/portable/NetworkInterface/LPC18xx/NetworkInterface.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ BaseType_t xNetworkInterfaceInitialise( void )
332332

333333
static __attribute__( ( section( "._ramAHB32" ) ) ) uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * niBUFFER_1_PACKET_SIZE ] __attribute__( ( aligned( 32 ) ) );
334334

335-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
335+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
336336
{
337337
uint8_t * ucRAMBuffer = ucNetworkPackets;
338338
uint32_t ul;
@@ -343,6 +343,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB
343343
*( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) );
344344
ucRAMBuffer += niBUFFER_1_PACKET_SIZE;
345345
}
346+
347+
return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING );
346348
}
347349
/*-----------------------------------------------------------*/
348350

‎source/portable/NetworkInterface/LPC54018/NetworkInterface.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,13 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxNetworkB
372372
/* statically allocate the buffers */
373373
/* allocating them as uint32_t's to force them into word alignment, a requirement of the DMA. */
374374
__ALIGN_BEGIN static uint32_t buffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ][ ( ipBUFFER_PADDING + ENET_RXBUFF_SIZE ) / sizeof( uint32_t ) + 1 ] __ALIGN_END;
375-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
375+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
376376
{
377377
for( int x = 0; x < ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS; x++ )
378378
{
379379
pxNetworkBuffers[ x ].pucEthernetBuffer = ( uint8_t * ) &buffers[ x ][ 0 ] + ipBUFFER_PADDING;
380380
buffers[ x ][ 0 ] = ( uint32_t ) &pxNetworkBuffers[ x ];
381381
}
382+
383+
return ENET_RXBUFF_SIZE;
382384
}

‎source/portable/NetworkInterface/M487/NetworkInterface.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxDescript
180180
}
181181

182182

183-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
183+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
184184
{
185185
uint8_t * ucRAMBuffer = ucNetworkPackets;
186186
uint32_t ul;
@@ -191,6 +191,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB
191191
*( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) );
192192
ucRAMBuffer += niBUFFER_1_PACKET_SIZE;
193193
}
194+
195+
return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING );
194196
}
195197

196198

‎source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static BaseType_t xMPS2_NetworkInterfaceOutput( NetworkInterface_t * pxInterface
368368
}
369369
/*-----------------------------------------------------------*/
370370

371-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
371+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
372372
{
373373
/* FIX ME if you want to use BufferAllocation_1.c, which uses statically
374374
* allocated network buffers. */
@@ -377,6 +377,7 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB
377377
* without implementing this function. */
378378
configASSERT( xRxTaskHandle == ( TaskHandle_t ) 1 );
379379
( void ) pxNetworkBuffers;
380+
return 0;
380381
}
381382
/*-----------------------------------------------------------*/
382383

‎source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ static BaseType_t xLAN91C111_NetworkInterfaceOutput( NetworkInterface_t * pxInte
485485
}
486486
/*-----------------------------------------------------------*/
487487

488-
void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
488+
size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] )
489489
{
490490
/* FIX ME if you want to use BufferAllocation_1.c, which uses statically
491491
* allocated network buffers. */
@@ -494,6 +494,7 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB
494494
* without implementing this function. */
495495
configASSERT( 0 );
496496
( void ) pxNetworkBuffers;
497+
return 0;
497498
}
498499
/*-----------------------------------------------------------*/
499500

0 commit comments

Comments
 (0)