Fix: add stricter checks on packet boundaries

[babeltrace.git] / formats / ctf / types / array.c

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index b1cbe2ffc77748a3e7389217ea495857e0faae87..b1e8d6c5af7b316110b31920a7a61ed125ac4c98 100644 (file)
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -28,13 +28,13 @@
 
 #include <babeltrace/ctf/types.h>
 
-int ctf_array_read(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
        struct declaration_array *array_declaration =
                array_definition->declaration;
-       struct declaration *elem = array_declaration->elem;
+       struct bt_declaration *elem = array_declaration->elem;
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
 
@@ -48,7 +48,8 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct definition *definition)
                        if (integer_declaration->len == CHAR_BIT
                            && integer_declaration->p.alignment == CHAR_BIT) {
 
-                               ctf_align_pos(pos, integer_declaration->p.alignment);
+                               if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+                                       return -EFAULT;
                                if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
                                        return -EFAULT;
 
@@ -56,7 +57,8 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct definition *definition)
                                g_string_insert_len(array_definition->string,
                                        0, (char *) ctf_get_pos_addr(pos),
                                        array_declaration->len);
-                               ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+                               if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+                                       return -EFAULT;
                                return 0;
                        }
                }
@@ -64,13 +66,13 @@ int ctf_array_read(struct bt_stream_pos *ppos, struct definition *definition)
        return bt_array_rw(ppos, definition);
 }
 
-int ctf_array_write(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_array *array_definition =
                container_of(definition, struct definition_array, p);
        struct declaration_array *array_declaration =
                array_definition->declaration;
-       struct declaration *elem = array_declaration->elem;
+       struct bt_declaration *elem = array_declaration->elem;
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
 
@@ -84,14 +86,16 @@ int ctf_array_write(struct bt_stream_pos *ppos, struct definition *definition)
                        if (integer_declaration->len == CHAR_BIT
                            && integer_declaration->p.alignment == CHAR_BIT) {
 
-                               ctf_align_pos(pos, integer_declaration->p.alignment);
+                               if (!ctf_align_pos(pos, integer_declaration->p.alignment))
+                                       return -EFAULT;
                                if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
                                        return -EFAULT;
 
                                memcpy((char *) ctf_get_pos_addr(pos),
                                        array_definition->string->str,
                                        array_declaration->len);
-                               ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+                               if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
+                                       return -EFAULT;
                                return 0;
                        }
                }