diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2021-06-14 09:07:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2021-06-14 09:07:45 +0200 |
| commit | 68afbd8459e9c8a86544b5e884041981b837e162 (patch) | |
| tree | d469492c943d94ed2654c35dfdf663671c6cde3d /fs/debugfs | |
| parent | drivers/base: Constify static attribute_group structs (diff) | |
| parent | Linux 5.13-rc6 (diff) | |
| download | linux-68afbd8459e9c8a86544b5e884041981b837e162.tar.gz linux-68afbd8459e9c8a86544b5e884041981b837e162.tar.bz2 linux-68afbd8459e9c8a86544b5e884041981b837e162.zip | |
Merge tag 'v5.13-rc6' into driver-core-next
We need the driver core fix in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/debugfs')
| -rw-r--r-- | fs/debugfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index fb0c102847d5..df00231d3ecc 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c @@ -874,7 +874,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; |