Changeset 1c88835 in mainline

Timestamp:

2017-07-08T16:12:03Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

89e2aac

Parents:

3cd27c1

Message:

Fix CDFS unaligned memory access when decoding Joliet file names.

Files:

• kernel/arch/amd64/src/interrupt.c (modified) (1 diff)
• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (2 diffs)

kernel/arch/amd64/src/interrupt.c

@@ -135 +135 @@
                         return;
                 }
+                as_print(TASK->as);
                 fault_if_from_uspace(istate, "General protection fault.");
         }

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -52 +52 @@
 #include <byteorder.h>
 #include <macros.h>
+#include <unaligned.h>
+
 #include "cdfs.h"
 #include "cdfs_endian.h"
@@ -458 +460 @@
                 size_t i;
                 for (i = 0; i < dsize / sizeof(uint16_t); i++) {
-                        buf[i] = uint16_t_be2host(((uint16_t *)data)[i]);
+                        buf[i] = uint16_t_be2host(
+                            ((unaligned_uint16_t *)data)[i]);
                 }