Changeset b5143bd in mainline for kernel/generic/src/udebug/udebug_ops.c

Timestamp:

2015-06-06T01:50:56Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0453261

Parents:

94e46c9 (diff), 87a2f9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

File:

• kernel/generic/src/udebug/udebug_ops.c (modified) (5 diffs)

kernel/generic/src/udebug/udebug_ops.c

@@ -375 +375 @@
         if (TASK->udebug.dt_state != UDEBUG_TS_ACTIVE) {
                 mutex_unlock(&TASK->udebug.lock);
+                free(id_buffer);
                 return EINVAL;
         }
@@ -456 +457 @@
 int udebug_args_read(thread_t *thread, void **buffer)
 {
-        /* Prepare a buffer to hold the arguments. */
-        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
-        
         /* On success, this will lock t->udebug.lock. */
         int rc = _thread_op_begin(thread, false);
@@ -471 +469 @@
         }
         
+        /* Prepare a buffer to hold the arguments. */
+        sysarg_t *arg_buffer = malloc(6 * sizeof(sysarg_t), 0);
+        
         /* Copy to a local buffer before releasing the lock. */
         memcpy(arg_buffer, thread->udebug.syscall_args, 6 * sizeof(sysarg_t));
@@ -499 +500 @@
 int udebug_regs_read(thread_t *thread, void **buffer)
 {
-        /* Prepare a buffer to hold the data. */
-        istate_t *state_buf = malloc(sizeof(istate_t), 0);
-        
         /* On success, this will lock t->udebug.lock */
         int rc = _thread_op_begin(thread, false);
@@ -512 +510 @@
                 return EBUSY;
         }
+        
+        /* Prepare a buffer to hold the data. */
+        istate_t *state_buf = malloc(sizeof(istate_t), 0);
         
         /* Copy to the allocated buffer */