Skip to content

Commit eafb55a

Browse files
committed
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
2 parents 9518ae6 + 53e4efa commit eafb55a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/orangefs/super.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf)
201201
(long)new_op->downcall.resp.statfs.files_avail);
202202

203203
buf->f_type = sb->s_magic;
204-
memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid));
204+
buf->f_fsid.val[0] = ORANGEFS_SB(sb)->fs_id;
205+
buf->f_fsid.val[1] = ORANGEFS_SB(sb)->id;
205206
buf->f_bsize = new_op->downcall.resp.statfs.block_size;
206207
buf->f_namelen = ORANGEFS_NAME_MAX;
207208

0 commit comments

Comments
 (0)