Add guards for closed socket in net.c
This is particularly problematic when calling FD_SET( -1, ... ), but let's
check it in all functions.
This was introduced with the new API and the fact the net_free() now sets the
internal fd to -1 in order to mark it as closed: now using this information.
diff --git a/library/net.c b/library/net.c
index 3c69646..bcec232 100644
--- a/library/net.c
+++ b/library/net.c
@@ -448,8 +448,13 @@
*/
int mbedtls_net_recv( void *ctx, unsigned char *buf, size_t len )
{
+ int ret;
int fd = ((mbedtls_net_context *) ctx)->fd;
- int ret = (int) read( fd, buf, len );
+
+ if( fd < 0 )
+ return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+
+ ret = (int) read( fd, buf, len );
if( ret < 0 )
{
@@ -485,6 +490,9 @@
fd_set read_fds;
int fd = ((mbedtls_net_context *) ctx)->fd;
+ if( fd < 0 )
+ return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+
FD_ZERO( &read_fds );
FD_SET( fd, &read_fds );
@@ -520,8 +528,13 @@
*/
int mbedtls_net_send( void *ctx, const unsigned char *buf, size_t len )
{
+ int ret;
int fd = ((mbedtls_net_context *) ctx)->fd;
- int ret = (int) write( fd, buf, len );
+
+ if( fd < 0 )
+ return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+
+ ret = (int) write( fd, buf, len );
if( ret < 0 )
{
