firewire: core: fix build failure due to the caller of fw_csr_string()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 5 Feb 2024 06:04:48 +0000 (15:04 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 11 Mar 2024 01:38:13 +0000 (10:38 +0900)
A commit 47dc55181dcb ("firewire: core: search descriptor leaf just after
vendor directory entry in root directory") for v6.8-rc3 and a commit
67a5a58c0443 ("firewire: Kill unnecessary buf check in
device_attribute.show") for v6.9 bring build failure in for-next tree due
to the change of the name of local variable.

This commit fixes it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/lkml/20240202111602.6f6e2c1a@canb.auug.org.au/
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202402022343.NkgsMITA-lkp@intel.com/
Link: https://lore.kernel.org/r/20240205060448.13881-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/core-device.c

index a802c6d4f4fdf03c922605c2d98908317f86b050..c0976f6268d3292206e7dcba40fd487837e633ba 100644 (file)
@@ -366,7 +366,7 @@ static ssize_t show_text_leaf(struct device *dev,
                        // in the root directory follows to the directory entry for vendor ID
                        // instead of the immediate value for vendor ID.
                        result = fw_csr_string(directories[i], CSR_DIRECTORY | attr->key, buf,
-                                              bufsize);
+                                              PAGE_SIZE - 1);
                        if (result >= 0)
                                ret = result;
                }