patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / fs / befs / linuxvfs.c

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 05e6005..649d02b 100644 (file)
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode)
                   befs_ino->i_inode_num.allocation_group,
                   befs_ino->i_inode_num.start, befs_ino->i_inode_num.len);
 
-       bh = befs_bread_iaddr(sb, befs_ino->i_inode_num);
+       bh = befs_bread(sb, inode->i_ino);
        if (!bh) {
                befs_error(sb, "unable to read inode block - "
                           "inode = %lu", inode->i_ino);
@@ -376,7 +376,7 @@ befs_read_inode(struct inode *inode)
        befs_ino->i_attribute = fsrun_to_cpu(sb, raw_inode->attributes);
        befs_ino->i_flags = fs32_to_cpu(sb, raw_inode->flags);
 
-       if (S_ISLNK(inode->i_mode) && !(inode->i_flags & BEFS_LONG_SYMLINK)) {
+       if (S_ISLNK(inode->i_mode) && !(befs_ino->i_flags & BEFS_LONG_SYMLINK)){
                inode->i_size = 0;
                inode->i_blocks = befs_sb->block_size / VFS_BLOCK_SIZE;
                strncpy(befs_ino->i_data.symlink, raw_inode->data.symlink,
@@ -571,7 +571,7 @@ befs_utf2nls(struct super_block *sb, const char *in,
                }
 
                /* convert from Unicode to nls */
-               unilen = nls->uni2char(uni, &result[o], 1);
+               unilen = nls->uni2char(uni, &result[o], in_len - o);
                if (unilen < 0) {
                        goto conv_err;
                }
@@ -584,7 +584,7 @@ befs_utf2nls(struct super_block *sb, const char *in,
        return o;
 
       conv_err:
-       befs_error(sb, "Name using charecter set %s contains a charecter that "
+       befs_error(sb, "Name using character set %s contains a character that "
                   "cannot be converted to unicode.", nls->charset);
        befs_debug(sb, "<--- utf2nls()");
        kfree(result);
@@ -856,6 +856,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
        if (befs_check_sb(sb) != BEFS_OK)
                goto unaquire_priv_sbp;
 
+       if( befs_sb->num_blocks > ~((sector_t)0) ) {
+               befs_error(sb, "blocks count: %Lu "
+                       "is larger than the host can use",
+                       befs_sb->num_blocks);
+               goto unaquire_priv_sbp;
+       }
+
        /*
         * set up enough so that it can read an inode
         * Fill in kernel superblock fields from private sb