Commit 53e4efa4 authored by Mike Marshall's avatar Mike Marshall
Browse files

orangefs: fix out-of-bounds fsid access 



Arnd Bergmann sent a patch to fsdevel, he says:

"orangefs_statfs() copies two consecutive fields of the superblock into
the statfs structure, which triggers a warning from the string fortification
helpers"

Jan Kara suggested an alternate way to do the patch to make it more readable.

I ran both ideas through xfstests and both seem fine. This patch
is based on Jan Kara's suggestion.

Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent dd5a440a

fs/orangefs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) 
		     (long)new_op->downcall.resp.statfs.files_avail);



	buf->f_type = sb->s_magic;

	memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid));

	buf->f_fsid.val[0] = ORANGEFS_SB(sb)->fs_id;

	buf->f_fsid.val[1] = ORANGEFS_SB(sb)->id;

	buf->f_bsize = new_op->downcall.resp.statfs.block_size;

	buf->f_namelen = ORANGEFS_NAME_MAX;