Changeset a21d837 in mainline

Timestamp:

2013-04-01T16:54:02Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c8830a2

Parents:

66108658

Message:

Explicitly treat the str argument to fat_lfn_str_nlength() as unaligned.

fat_lfn_str_nlength() was defined to take uint16_t * and as such had
reasons to assume natural alignment of the pointed object. This was
however not the case when the function was called from fat_lfn_size()
because the argument there is an address from inside a packed structure.

Location:

uspace/srv/fs/fat

Files:

• fat_dentry.c (modified) (3 diffs)
• fat_dentry.h (modified) (3 diffs)

uspace/srv/fs/fat/fat_dentry.c

@@ -44 +44 @@
 #include <assert.h>
 #include <unistd.h>
+#include <sys/types.h>
 
 /** Compare path component with the name read from the dentry.
@@ -232 +233 @@
 /** Get number of bytes in a string with size limit.
  *
- * @param str  NULL-terminated (or not) string.
+ * @param str  NULL-terminated (or not) string. The pointer comes from a packed
+ *             structure and as such is expected to be unaligned. 
  * @param size Maximum number of bytes to consider.
  *
@@ -238 +240 @@
  *
  */
-size_t fat_lfn_str_nlength(const uint16_t *str, size_t size)
+size_t fat_lfn_str_nlength(const unaligned_uint16_t *str, size_t size)
 {
         size_t offset = 0;

uspace/srv/fs/fat/fat_dentry.h

@@ -37 +37 @@
 #include <stdint.h>
 #include <stdbool.h>
+#include <sys/types.h>
 
 #define IS_D_CHAR(ch) (isalnum(ch) || ch == '_')
@@ -132 +133 @@
 } __attribute__ ((packed)) fat_dentry_t;
 
-
 extern int fat_dentry_namecmp(char *, const char *);
 extern void fat_dentry_name_get(const fat_dentry_t *, char *);
@@ -139 +139 @@
 extern uint8_t fat_dentry_chksum(uint8_t *);
 
-extern size_t fat_lfn_str_nlength(const uint16_t *, size_t);
+extern size_t fat_lfn_str_nlength(const unaligned_uint16_t *, size_t);
 extern size_t fat_lfn_size(const fat_dentry_t *);
 extern size_t fat_lfn_get_entry(const fat_dentry_t *, uint16_t *, size_t *);