Skip to content

L
linux
Commit d0969d19 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Linus Torvalds
Browse files
Options

HPFS: Fix some unaligned accesses 

Fix some unaligned accesses
Signed-off-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b69760b
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 24 deletions
fs/hpfs/ea.c
View file @ d0969d19
...@@ -24,7 +24,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len) ...@@ -24,7 +24,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len)
} }
if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return; if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return;
if (ea->indirect) { if (ea->indirect) {
if (le16_to_cpu(ea->valuelen) != 8) { if (ea_valuelen(ea) != 8) {
hpfs_error(s, "ea->indirect set while ea->valuelen!=8, %s %08x, pos %08x", hpfs_error(s, "ea->indirect set while ea->valuelen!=8, %s %08x, pos %08x",
ano ? "anode" : "sectors", a, pos); ano ? "anode" : "sectors", a, pos);
return; return;
...@@ -33,7 +33,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len) ...@@ -33,7 +33,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len)
return; return;
hpfs_ea_remove(s, ea_sec(ea), ea->anode, ea_len(ea)); hpfs_ea_remove(s, ea_sec(ea), ea->anode, ea_len(ea));
} }
pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5; pos += ea->namelen + ea_valuelen(ea) + 5;
} }
if (!ano) hpfs_free_sectors(s, a, (len+511) >> 9); if (!ano) hpfs_free_sectors(s, a, (len+511) >> 9);
else { else {
...@@ -82,10 +82,10 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key, ...@@ -82,10 +82,10 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key,
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
goto indirect; goto indirect;
if (le16_to_cpu(ea->valuelen) >= size) if (ea_valuelen(ea) >= size)
return -EINVAL; return -EINVAL;
memcpy(buf, ea_data(ea), le16_to_cpu(ea->valuelen)); memcpy(buf, ea_data(ea), ea_valuelen(ea));
buf[le16_to_cpu(ea->valuelen)] = 0; buf[ea_valuelen(ea)] = 0;
return 0; return 0;
} }
a = le32_to_cpu(fnode->ea_secno); a = le32_to_cpu(fnode->ea_secno);
...@@ -106,14 +106,14 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key, ...@@ -106,14 +106,14 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key,
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
goto indirect; goto indirect;
if (le16_to_cpu(ea->valuelen) >= size) if (ea_valuelen(ea) >= size)
return -EINVAL; return -EINVAL;
if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, le16_to_cpu(ea->valuelen), buf)) if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), buf))
return -EIO; return -EIO;
buf[le16_to_cpu(ea->valuelen)] = 0; buf[ea_valuelen(ea)] = 0;
return 0; return 0;
} }
pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5; pos += ea->namelen + ea_valuelen(ea) + 5;
} }
return -ENOENT; return -ENOENT;
indirect: indirect:
...@@ -138,12 +138,12 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si ...@@ -138,12 +138,12 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea)); return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea));
if (!(ret = kmalloc((*size = le16_to_cpu(ea->valuelen)) + 1, GFP_NOFS))) { if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {
printk("HPFS: out of memory for EA\n"); printk("HPFS: out of memory for EA\n");
return NULL; return NULL;
} }
memcpy(ret, ea_data(ea), le16_to_cpu(ea->valuelen)); memcpy(ret, ea_data(ea), ea_valuelen(ea));
ret[le16_to_cpu(ea->valuelen)] = 0; ret[ea_valuelen(ea)] = 0;
return ret; return ret;
} }
a = le32_to_cpu(fnode->ea_secno); a = le32_to_cpu(fnode->ea_secno);
...@@ -164,18 +164,18 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si ...@@ -164,18 +164,18 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea)); return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea));
if (!(ret = kmalloc((*size = le16_to_cpu(ea->valuelen)) + 1, GFP_NOFS))) { if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {
printk("HPFS: out of memory for EA\n"); printk("HPFS: out of memory for EA\n");
return NULL; return NULL;
} }
if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, le16_to_cpu(ea->valuelen), ret)) { if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), ret)) {
kfree(ret); kfree(ret);
return NULL; return NULL;
} }
ret[le16_to_cpu(ea->valuelen)] = 0; ret[ea_valuelen(ea)] = 0;
return ret; return ret;
} }
pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5; pos += ea->namelen + ea_valuelen(ea) + 5;
} }
return NULL; return NULL;
} }
...@@ -202,7 +202,7 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -202,7 +202,7 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
if (ea->indirect) { if (ea->indirect) {
if (ea_len(ea) == size) if (ea_len(ea) == size)
set_indirect_ea(s, ea->anode, ea_sec(ea), data, size); set_indirect_ea(s, ea->anode, ea_sec(ea), data, size);
} else if (le16_to_cpu(ea->valuelen) == size) { } else if (ea_valuelen(ea) == size) {
memcpy(ea_data(ea), data, size); memcpy(ea_data(ea), data, size);
} }
return; return;
...@@ -228,12 +228,12 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -228,12 +228,12 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
set_indirect_ea(s, ea->anode, ea_sec(ea), data, size); set_indirect_ea(s, ea->anode, ea_sec(ea), data, size);
} }
else { else {
if (le16_to_cpu(ea->valuelen) == size) if (ea_valuelen(ea) == size)
hpfs_ea_write(s, a, ano, pos + 4 + ea->namelen + 1, size, data); hpfs_ea_write(s, a, ano, pos + 4 + ea->namelen + 1, size, data);
} }
return; return;
} }
pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5; pos += ea->namelen + ea_valuelen(ea) + 5;
} }
if (!le16_to_cpu(fnode->ea_offs)) { if (!le16_to_cpu(fnode->ea_offs)) {
/*if (le16_to_cpu(fnode->ea_size_s)) { /*if (le16_to_cpu(fnode->ea_size_s)) {
...@@ -254,7 +254,8 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -254,7 +254,8 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
ea = fnode_end_ea(fnode); ea = fnode_end_ea(fnode);
*(char *)ea = 0; *(char *)ea = 0;
ea->namelen = strlen(key); ea->namelen = strlen(key);
ea->valuelen = cpu_to_le16(size); ea->valuelen_lo = size;
ea->valuelen_hi = size >> 8;
strcpy(ea->name, key); strcpy(ea->name, key);
memcpy(ea_data(ea), data, size); memcpy(ea_data(ea), data, size);
fnode->ea_size_s = cpu_to_le16(le16_to_cpu(fnode->ea_size_s) + strlen(key) + size + 5); fnode->ea_size_s = cpu_to_le16(le16_to_cpu(fnode->ea_size_s) + strlen(key) + size + 5);
......
fs/hpfs/hpfs.h
View file @ d0969d19
...@@ -546,7 +546,8 @@ struct extended_attribute ...@@ -546,7 +546,8 @@ struct extended_attribute
where real value starts */ where real value starts */
#endif #endif
u8 namelen; /* length of name, bytes */ u8 namelen; /* length of name, bytes */
u16 valuelen; /* length of value, bytes */ u8 valuelen_lo; /* length of value, bytes */
u8 valuelen_hi; /* length of value, bytes */
u8 name[0]; u8 name[0];
/* /*
u8 name[namelen]; ascii attrib name u8 name[namelen]; ascii attrib name
......
fs/hpfs/hpfs_fn.h
View file @ d0969d19
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/unaligned.h>
#include "hpfs.h" #include "hpfs.h"
...@@ -135,19 +136,24 @@ static inline struct extended_attribute *fnode_end_ea(struct fnode *fnode) ...@@ -135,19 +136,24 @@ static inline struct extended_attribute *fnode_end_ea(struct fnode *fnode)
return (struct extended_attribute *)((char *)fnode + le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s)); return (struct extended_attribute *)((char *)fnode + le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s));
} }
static unsigned ea_valuelen(struct extended_attribute *ea)
{
return ea->valuelen_lo + 256 * ea->valuelen_hi;
}
static inline struct extended_attribute *next_ea(struct extended_attribute *ea) static inline struct extended_attribute *next_ea(struct extended_attribute *ea)
{ {
return (struct extended_attribute *)((char *)ea + 5 + ea->namelen + le16_to_cpu(ea->valuelen)); return (struct extended_attribute *)((char *)ea + 5 + ea->namelen + ea_valuelen(ea));
} }
static inline secno ea_sec(struct extended_attribute *ea) static inline secno ea_sec(struct extended_attribute *ea)
{ {
return le32_to_cpu(*((secno *)((char *)ea + 9 + ea->namelen))); return le32_to_cpu(get_unaligned((secno *)((char *)ea + 9 + ea->namelen)));
} }
static inline secno ea_len(struct extended_attribute *ea) static inline secno ea_len(struct extended_attribute *ea)
{ {
return le32_to_cpu(*((secno *)((char *)ea + 5 + ea->namelen))); return le32_to_cpu(get_unaligned((secno *)((char *)ea + 5 + ea->namelen)));
} }
static inline char *ea_data(struct extended_attribute *ea) static inline char *ea_data(struct extended_attribute *ea)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7