Commit eafb55a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs update from Mike Marshall:
 "Fix out-of-bounds fsid access.

  Small fix to quiet warnings from string fortification helpers,
  suggested by Arnd Bergmann"

* tag 'for-linus-6.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: fix out-of-bounds fsid access
parents 9518ae6e 53e4efa4

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;