len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-16 08:35:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add checks in FreeRTOS_Socket.c (#104)

Browse source 
* Add fail-safes to FreeRTOS_Socket.c

* Use all 'pd' errors

* Correction after Hein's comments

* Correction after Hein's comments v2

* Changes after Hein's comments

* Update after Gary's comments
This commit is contained in:
Aniruddha Kanhere 2020-07-01 13:56:27 -07:00 • committed by GitHub
parent a9b2aac4e9
commit d5fedeaa96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
View file

@ -1395,8 +1395,12 @@ FreeRTOS_Socket_t *pxSocket;
sockets standard, but this implementation does not use all the parameters. */ sockets standard, but this implementation does not use all the parameters. */
( void ) lLevel; ( void ) lLevel;
( void ) uxOptionLength; ( void ) uxOptionLength;
configASSERT( xSocket != NULL ); if( ( pxSocket == NULL ) || ( pxSocket == FREERTOS_INVALID_SOCKET ) )
{
xReturn = -pdFREERTOS_ERRNO_EINVAL;
return xReturn;
}
switch( lOptionName ) switch( lOptionName )
{ {
@ -2200,7 +2204,12 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t *pxSocket )
{ {
BaseType_t xResult = 0; BaseType_t xResult = 0;
if( prvValidSocket( pxSocket, FREERTOS_IPPROTO_TCP, pdFALSE ) == pdFALSE ) if( pxAddress == NULL )
{
/* NULL address passed to the function. Invalid value. */
xResult = -pdFREERTOS_ERRNO_EINVAL;
}
else if( prvValidSocket( pxSocket, FREERTOS_IPPROTO_TCP, pdFALSE ) == pdFALSE )
{ {
/* Not a valid socket or wrong type */ /* Not a valid socket or wrong type */
xResult = -pdFREERTOS_ERRNO_EBADF; xResult = -pdFREERTOS_ERRNO_EBADF;
@ -2271,7 +2280,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t *pxSocket )
FreeRTOS_Socket_t *pxSocket = ( FreeRTOS_Socket_t* ) xClientSocket; FreeRTOS_Socket_t *pxSocket = ( FreeRTOS_Socket_t* ) xClientSocket;
TickType_t xRemainingTime; TickType_t xRemainingTime;
BaseType_t xTimed = pdFALSE; BaseType_t xTimed = pdFALSE;
BaseType_t xResult; BaseType_t xResult = -pdFREERTOS_ERRNO_EINVAL;
TimeOut_t xTimeOut; TimeOut_t xTimeOut;
( void ) xAddressLength; ( void ) xAddressLength;
@ -2484,6 +2493,12 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t *pxSocket )
{ {
xByteCount = -pdFREERTOS_ERRNO_EINVAL; xByteCount = -pdFREERTOS_ERRNO_EINVAL;
} }
else if( ( ( ( uint32_t ) xFlags & ( uint32_t ) FREERTOS_ZERO_COPY ) != 0U ) &&
( pvBuffer == NULL ) )
{
/* In zero-copy mode, pvBuffer is a pointer to a pointer ( not NULL ). */
xByteCount = -pdFREERTOS_ERRNO_EINVAL;
}
else else
{ {
if( pxSocket->u.xTCP.rxStream != NULL ) if( pxSocket->u.xTCP.rxStream != NULL )
@ -2746,7 +2761,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t *pxSocket )
*/ */
BaseType_t FreeRTOS_send( Socket_t xSocket, const void *pvBuffer, size_t uxDataLength, BaseType_t xFlags ) BaseType_t FreeRTOS_send( Socket_t xSocket, const void *pvBuffer, size_t uxDataLength, BaseType_t xFlags )
{ {
BaseType_t xByteCount; BaseType_t xByteCount = -pdFREERTOS_ERRNO_EINVAL;
BaseType_t xBytesLeft; BaseType_t xBytesLeft;
FreeRTOS_Socket_t *pxSocket = ( FreeRTOS_Socket_t * ) xSocket; FreeRTOS_Socket_t *pxSocket = ( FreeRTOS_Socket_t * ) xSocket;
TickType_t xRemainingTime; TickType_t xRemainingTime;
@ -2758,8 +2773,11 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t *pxSocket )
/* Prevent compiler warnings about unused parameters. The parameter /* Prevent compiler warnings about unused parameters. The parameter
may be used in future versions. */ may be used in future versions. */
( void ) xFlags; ( void ) xFlags;
xByteCount = ( BaseType_t ) prvTCPSendCheck( pxSocket, uxDataLength ); if( pvBuffer != NULL )
{
xByteCount = ( BaseType_t ) prvTCPSendCheck( pxSocket, uxDataLength );
}
if( xByteCount > 0 ) if( xByteCount > 0 )
{ {