Commit 2b943cf0 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] fix %s in affs_fill_super()

%s is only valid if array is known to contain NUL or precision is given and
does not exceed the size of array.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f82ccdb9
...@@ -271,6 +271,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -271,6 +271,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
int reserved; int reserved;
unsigned long mount_flags; unsigned long mount_flags;
int tmp_flags; /* fix remount prototype... */ int tmp_flags; /* fix remount prototype... */
u8 sig[4];
pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options"); pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options");
...@@ -370,8 +371,9 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -370,8 +371,9 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
printk(KERN_ERR "AFFS: Cannot read boot block\n"); printk(KERN_ERR "AFFS: Cannot read boot block\n");
goto out_error; goto out_error;
} }
chksum = be32_to_cpu(*(__be32 *)boot_bh->b_data); memcpy(sig, boot_bh->b_data, 4);
brelse(boot_bh); brelse(boot_bh);
chksum = be32_to_cpu(*(__be32 *)sig);
/* Dircache filesystems are compatible with non-dircache ones /* Dircache filesystems are compatible with non-dircache ones
* when reading. As long as they aren't supported, writing is * when reading. As long as they aren't supported, writing is
...@@ -420,11 +422,11 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -420,11 +422,11 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
} }
if (mount_flags & SF_VERBOSE) { if (mount_flags & SF_VERBOSE) {
chksum = cpu_to_be32(chksum); u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0];
printk(KERN_NOTICE "AFFS: Mounting volume \"%*s\": Type=%.3s\\%c, Blocksize=%d\n", printk(KERN_NOTICE "AFFS: Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",
AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0], len > 31 ? 31 : len,
AFFS_ROOT_TAIL(sb, root_bh)->disk_name + 1, AFFS_ROOT_TAIL(sb, root_bh)->disk_name + 1,
(char *)&chksum,((char *)&chksum)[3] + '0',blocksize); sig, sig[3] + '0', blocksize);
} }
sb->s_flags |= MS_NODEV | MS_NOSUID; sb->s_flags |= MS_NODEV | MS_NOSUID;
......
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