Commit 875db86e authored by Kees Cook's avatar Kees Cook Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: vhci: Avoid needless snprintf() calls 



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: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202401250927.1poZERd6-lkp@intel.com/
Fixes: ab4e4380 ("Bluetooth: Add vhci devcoredump support")
Link: https://github.com/llvm/llvm-project/commit/ea2e66aa8b6e363b89df66dc44275a0d7ecd70ce

 [1]
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKees Cook <kees@kernel.org>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent e2e49e21

drivers/bluetooth/hci_vhci.c

+5 −5
Original line number Diff line number Diff line
@@ -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));

}