Merge tag 'driver-core-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

87a7f736 · Linus Torvalds <[email protected]> · 2021-06-12 12:18:49 -07:00

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()

Commit: 87a7f7368be5bfdc43c2b46a6703880ab25cbd1f
Parents: 1dfa2e77 · f501b6a2

Merge commit. Changes below are compared with the first parent: 1dfa2e77.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/debugfs/file.c	modified	+1	−1	View file

fs/debugfs/file.c

View file

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index e813acf..ba7c01c 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;