Merge tag 'char-misc-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are some small char and misc driver fixes for 5.2-rc4 to resolve
  a number of reported issues.

  The most "notable" one here is the kernel headers in proc^Wsysfs
  fixes. Those changes move the header file info into sysfs and fixes
  the build issues that you reported.

  Other than that, a bunch of small habanalabs driver fixes, some fpga
  driver fixes, and a few other tiny driver fixes.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  habanalabs: Read upper bits of trace buffer from RWPHI
  habanalabs: Fix virtual address access via debugfs for 2MB pages
  fpga: zynqmp-fpga: Correctly handle error pointer
  habanalabs: fix bug in checking huge page optimization
  habanalabs: Avoid using a non-initialized MMU cache mutex
  habanalabs: fix debugfs code
  uapi/habanalabs: add opcode for enable/disable device debug mode
  habanalabs: halt debug engines on user process close
  test_firmware: Use correct snprintf() limit
  genwqe: Prevent an integer overflow in the ioctl
  parport: Fix mem leak in parport_register_dev_model
  fpga: dfl: expand minor range when registering chrdev region
  fpga: dfl: Add lockdep classes for pdata->lock
  fpga: dfl: afu: Pass the correct device to dma_mapping_error()
  fpga: stratix10-soc: fix use-after-free on s10_init()
  w1: ds2408: Fix typo after 49695ac46861 (reset on output_write retry with readback)
  kheaders: Do not regenerate archive if config is not changed
  kheaders: Move from proc to sysfs
  lkdtm/bugs: Adjust recursion test to avoid elision
  lkdtm/usercopy: Moves the KERNEL_DS test to non-canonical

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 787c146eb485..83ea6c4e623c 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -224,30 +224,30 @@ static ssize_t config_show(struct device *dev,
 
         mutex_lock(&test_fw_mutex);
 
-        len += snprintf(buf, PAGE_SIZE,
+        len += scnprintf(buf, PAGE_SIZE - len,
                         "Custom trigger configuration for: %s\n",
                         dev_name(dev));
 
         if (test_fw_config->name)
-                len += snprintf(buf+len, PAGE_SIZE,
+                len += scnprintf(buf+len, PAGE_SIZE - len,
                                 "name:\t%s\n",
                                 test_fw_config->name);
         else
-                len += snprintf(buf+len, PAGE_SIZE,
+                len += scnprintf(buf+len, PAGE_SIZE - len,
                                 "name:\tEMTPY\n");
 
-        len += snprintf(buf+len, PAGE_SIZE,
+        len += scnprintf(buf+len, PAGE_SIZE - len,
                         "num_requests:\t%u\n", test_fw_config->num_requests);
 
-        len += snprintf(buf+len, PAGE_SIZE,
+        len += scnprintf(buf+len, PAGE_SIZE - len,
                         "send_uevent:\t\t%s\n",
                         test_fw_config->send_uevent ?
                         "FW_ACTION_HOTPLUG" :
                         "FW_ACTION_NOHOTPLUG");
-        len += snprintf(buf+len, PAGE_SIZE,
+        len += scnprintf(buf+len, PAGE_SIZE - len,
                         "sync_direct:\t\t%s\n",
                         test_fw_config->sync_direct ? "true" : "false");
-        len += snprintf(buf+len, PAGE_SIZE,
+        len += scnprintf(buf+len, PAGE_SIZE - len,
                         "read_fw_idx:\t%u\n", test_fw_config->read_fw_idx);
 
         mutex_unlock(&test_fw_mutex);