diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 17:44:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 17:44:14 -0700 |
| commit | eafb55a3ee31ec4f982855bdaa5b692bde2d498f (patch) | |
| tree | 0f6924a5854a8379bc648dd33e89ac760111ce54 /fs/orangefs | |
| parent | 9518ae6ec57ada7d6c373588036163bf7aaf1c50 (diff) | |
| parent | 53e4efa470d5fc6a96662d2d3322cfc925818517 (diff) | |
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
Diffstat (limited to 'fs/orangefs')
| -rw-r--r-- | fs/orangefs/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index fb4d09c2f531..eba3e357192e 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -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; |