summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-06-12 21:18:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2021-06-12 21:18:49 +0200
commit87a7f7368be5bfdc43c2b46a6703880ab25cbd1f (patch)
treea8d4bd0ab67f6e7f3d94048705ddf92068c6a0d3 /fs
parentMerge tag 'char-misc-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentdebugfs: Fix debugfs_read_file_str() (diff)
downloadlinux-87a7f7368be5bfdc43c2b46a6703880ab25cbd1f.tar.xz
linux-87a7f7368be5bfdc43c2b46a6703880ab25cbd1f.zip
Merge tag 'driver-core-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH: "A single debugfs fix for 5.13-rc6, fixing a bug in debugfs_read_file_str() that showed up in 5.13-rc1. It has been in linux-next for a full week with no reported problems" * tag 'driver-core-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: debugfs: Fix debugfs_read_file_str()
Diffstat (limited to 'fs')
-rw-r--r--fs/debugfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index e813acfaa6e8..ba7c01cd9a5d 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -893,7 +893,7 @@ ssize_t debugfs_read_file_str(struct file *file, char __user *user_buf,
copy[copy_len] = '\n';
- ret = simple_read_from_buffer(user_buf, count, ppos, copy, copy_len);
+ ret = simple_read_from_buffer(user_buf, count, ppos, copy, len);
kfree(copy);
return ret;