summaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-03 21:44:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-03 21:44:35 -0800
commit0710f3ff91ecc4a715db6e4d0690472b13c4dac6 (patch)
treebb103c5b2248a5f4e8cf78e76d1d07ffdc2a4aeb /fs/hfs
parenta3b4924b027f9a4b95ce89a914c1e0459e76f18a (diff)
parenteec11535ca3d3e2daa2c8f59fa8ce1963db98abd (diff)
downloadlinux-0710f3ff91ecc4a715db6e4d0690472b13c4dac6.tar.bz2
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc final vfs updates from Al Viro: "A few unrelated patches that got beating in -next. Everything else will have to go into the next window ;-/" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: hfs: fix hfs_readdir() selftest for default_file_splice_read() infoleak 9p: constify ->d_name handling
Diffstat (limited to 'fs/hfs')
-rw-r--r--fs/hfs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 5de5c48b418d..75b254280ff6 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -169,7 +169,7 @@ static int hfs_readdir(struct file *file, struct dir_context *ctx)
* Can be done after the list insertion; exclusion with
* hfs_delete_cat() is provided by directory lock.
*/
- memcpy(&rd->key, &fd.key, sizeof(struct hfs_cat_key));
+ memcpy(&rd->key, &fd.key->cat, sizeof(struct hfs_cat_key));
out:
hfs_find_exit(&fd);
return err;