Changeset f4a27304 in mainline

Timestamp:

2013-07-16T16:26:51Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c0f3460

Parents:

a940f1d

Message:

do not allocate the buffer on stack (thx Antonin Steinhauser)

Location:

uspace/srv/net

Files:

• tcp/sock.c (modified) (6 diffs)
• udp/sock.c (modified) (5 diffs)

uspace/srv/net/tcp/sock.c

@@ -613 +613 @@
         ipc_callid_t wcallid;
         size_t length;
-        uint8_t buffer[TCP_SOCK_FRAGMENT_SIZE];
         tcp_error_t trc;
         int rc;
+        
+        uint8_t *buffer = calloc(TCP_SOCK_FRAGMENT_SIZE, 1);
+        if (buffer == NULL) {
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_send()");
@@ -625 +630 @@
         if (sock_core == NULL) {
                 async_answer_0(callid, ENOTSOCK);
-                return;
+                goto out;
         }
 
@@ -641 +646 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, EINVAL);
-                        return;
+                        goto out;
                 }
 
@@ -651 +656 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
 
@@ -676 +681 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
         }
@@ -685 +690 @@
             IPC_GET_ARG2(answer));
         fibril_mutex_unlock(&socket->lock);
+        
+out:
+        free(buffer);
 }
 

uspace/srv/net/udp/sock.c

@@ -265 +265 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()");
         
+        uint8_t *buffer = calloc(UDP_FRAGMENT_SIZE, 1);
+        if (buffer == NULL) {
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+        
         struct sockaddr_in6 *addr6 = NULL;
         struct sockaddr_in *addr;
@@ -276 +282 @@
                 if (rc != EOK) {
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
                 
@@ -357 +363 @@
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_sendto: Failed to "
                             "determine local address.");
-                        return;
+                        goto out;
                 }
                 
@@ -379 +385 @@
                         length = UDP_FRAGMENT_SIZE;
                 
-                uint8_t buffer[UDP_FRAGMENT_SIZE];
                 int rc = async_data_write_finalize(wcallid, buffer, length);
                 if (rc != EOK) {
@@ -425 +430 @@
         if (addr6 != NULL)
                 free(addr6);
+        
+        free(buffer);
 }