Fix: add stricter checks on packet boundaries

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

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index a14d5891027370cac352bc5522aebd6d5c38aed8..5dae7d0281d4610c586d00b2ee487e8ddb5a063d 100644 (file)
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -3,7 +3,9 @@
  *
  * Sequence format access functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -14,17 +16,25 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf/types.h>
 
-int ctf_sequence_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_sequence_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_sequence *sequence_definition =
                container_of(definition, struct definition_sequence, p);
        struct declaration_sequence *sequence_declaration =
                sequence_definition->declaration;
-       struct declaration *elem = sequence_declaration->elem;
+       struct bt_declaration *elem = sequence_declaration->elem;
        struct ctf_stream_pos *pos = ctf_pos(ppos);
 
        if (elem->id == CTF_TYPE_INTEGER) {
@@ -36,30 +46,32 @@ int ctf_sequence_read(struct stream_pos *ppos, struct definition *definition)
 
                        if (integer_declaration->len == CHAR_BIT
                            && integer_declaration->p.alignment == CHAR_BIT) {
-                               uint64_t len = sequence_len(sequence_definition);
+                               uint64_t len = bt_sequence_len(sequence_definition);
 
-                               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, len * CHAR_BIT))
                                        return -EFAULT;
 
                                g_string_assign(sequence_definition->string, "");
                                g_string_insert_len(sequence_definition->string,
                                        0, (char *) ctf_get_pos_addr(pos), len);
-                               ctf_move_pos(pos, len * CHAR_BIT);
+                               if (!ctf_move_pos(pos, len * CHAR_BIT))
+                                       return -EFAULT;
                                return 0;
                        }
                }
        }
-       return sequence_rw(ppos, definition);
+       return bt_sequence_rw(ppos, definition);
 }
 
-int ctf_sequence_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_sequence_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_sequence *sequence_definition =
                container_of(definition, struct definition_sequence, p);
        struct declaration_sequence *sequence_declaration =
                sequence_definition->declaration;
-       struct declaration *elem = sequence_declaration->elem;
+       struct bt_declaration *elem = sequence_declaration->elem;
        struct ctf_stream_pos *pos = ctf_pos(ppos);
 
        if (elem->id == CTF_TYPE_INTEGER) {
@@ -71,18 +83,20 @@ int ctf_sequence_write(struct stream_pos *ppos, struct definition *definition)
 
                        if (integer_declaration->len == CHAR_BIT
                            && integer_declaration->p.alignment == CHAR_BIT) {
-                               uint64_t len = sequence_len(sequence_definition);
+                               uint64_t len = bt_sequence_len(sequence_definition);
 
-                               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, len * CHAR_BIT))
                                        return -EFAULT;
 
                                memcpy((char *) ctf_get_pos_addr(pos),
                                        sequence_definition->string->str, len);
-                               ctf_move_pos(pos, len * CHAR_BIT);
+                               if (!ctf_move_pos(pos, len * CHAR_BIT))
+                                       return -EFAULT;
                                return 0;
                        }
                }
        }
-       return sequence_rw(ppos, definition);
+       return bt_sequence_rw(ppos, definition);
 }