Bluetooth: vhci: Avoid needless snprintf() calls

commit 875db86e1ec75fe633f1e85ed2f92c731cdbf760 upstream.

Avoid double-copying of string literals. Use a "const char *" for each
string instead of copying from .rodata into stack and then into the skb.
We can go directly from .rodata to the skb.

This also works around a Clang bug (that has since been fixed[1]).

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202401250927.1poZERd6-lkp@intel.com/
Fixes: ab4e4380d4e1 ("Bluetooth: Add vhci devcoredump support")
Link: https://github.com/llvm/llvm-project/commit/ea2e66aa8b6e363b89df66dc44275a0d7ecd70ce
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 28750a40f0ed52aab23f519e47bdd886d46780bd..4bfc78f9781ede3863a98d7c03ca89a4b89b645b 100644 (file)
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -289,18 +289,18 @@ static void vhci_coredump(struct hci_dev *hdev)
 
 static void vhci_coredump_hdr(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       char buf[80];
+       const char *buf;
 
-       snprintf(buf, sizeof(buf), "Controller Name: vhci_ctrl\n");
+       buf = "Controller Name: vhci_ctrl\n";
        skb_put_data(skb, buf, strlen(buf));
 
-       snprintf(buf, sizeof(buf), "Firmware Version: vhci_fw\n");
+       buf = "Firmware Version: vhci_fw\n";
        skb_put_data(skb, buf, strlen(buf));
 
-       snprintf(buf, sizeof(buf), "Driver: vhci_drv\n");
+       buf = "Driver: vhci_drv\n";
        skb_put_data(skb, buf, strlen(buf));
 
-       snprintf(buf, sizeof(buf), "Vendor: vhci\n");
+       buf = "Vendor: vhci\n";
        skb_put_data(skb, buf, strlen(buf));
 }