Changeset 7fb2ce3 in mainline

Timestamp:

2010-02-17T00:27:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f430f58

Parents:

61ee6df

Message:

Fix a couple of stack corruptions in networking code.

Location:

uspace/srv/net

Files:

• modules.c (modified) (1 diff)
• socket/socket_client.c (modified) (4 diffs)
• structures/packet/packet_remote.c (modified) (2 diffs)

uspace/srv/net/modules.c

@@ -55 +55 @@
 
 int connect_to_service_timeout( services_t need, suseconds_t timeout ){
-        int     phone;
-        int     res;
+        ipcarg_t phone;
+        int res;
 
         while( true ){
-                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, ( ipcarg_t * ) & phone );
-                if(( res >= 0 ) && ( phone >= 0 )){
+                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, & phone );
+                if( res >= 0 ){
                         return phone;
                 }

uspace/srv/net/socket/socket_client.c

@@ -541 +541 @@
         socket_ref              new_socket;
         aid_t                   message_id;
-        int                             result;
+        ipcarg_t                ipc_result;
+        int                     result;
         ipc_call_t              answer;
 
@@ -592 +593 @@
         ipc_data_read_start( socket->phone, cliaddr, * addrlen );
         fibril_rwlock_write_unlock( & socket_globals.lock );
-        async_wait_for( message_id, ( ipcarg_t * ) & result );
+        async_wait_for( message_id, & ipc_result );
+        result = (int) ipc_result;
         if( result > 0 ){
                 if( result != socket_id ){
@@ -734 +736 @@
         socket_ref              socket;
         aid_t                   message_id;
-        int                             result;
+        ipcarg_t                ipc_result;
+        int                     result;
         size_t                  fragments;
         size_t *                lengths;
@@ -793 +796 @@
                 }
         }
-        async_wait_for( message_id, ( ipcarg_t * ) & result );
+        async_wait_for( message_id, & ipc_result );
+        result = (int) ipc_result;
         // if successful
         if( result == EOK ){

uspace/srv/net/structures/packet/packet_remote.c

@@ -101 +101 @@
         ERROR_DECLARE;
 
-        packet_id_t     packet_id;
+        ipcarg_t packet_id;
         ipcarg_t size;
         packet_t packet;
 
-        if( ERROR_OCCURRED( async_req_4_2( phone, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, ( ipcarg_t * ) & packet_id, & size ))){
+        if( ERROR_OCCURRED( async_req_4_2( phone, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, & packet_id, & size ))){
                 return NULL;
         }
@@ -120 +120 @@
         ERROR_DECLARE;
 
-        packet_id_t     packet_id;
+        ipcarg_t        packet_id;
         ipcarg_t        size;
         packet_t        packet;
 
-        if( ERROR_OCCURRED( async_req_1_2( phone, NET_PACKET_CREATE_1, content, ( ipcarg_t * ) & packet_id, & size ))){
+        if( ERROR_OCCURRED( async_req_1_2( phone, NET_PACKET_CREATE_1, content, & packet_id, & size ))){
                 return NULL;
         }