[PATCH 23/28] Input: synaptics_usb - use seq_buf and snprintf() for name and phys
From: Bill Wendling <morbo@google.com>
Date: 2026-09-15 08:20:22
Also in:
dri-devel, intel-wired-lan, intel-xe, linux-devicetree, linux-edac, linux-gpio, linux-hardening, linux-media, linux-mips, linux-nfs, linux-samsung-soc, linux-scsi, linux-sound, linux-wireless, lkml, loongarch, netdev
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
synusb_probe() constructs the device name and physical path using a mix of strscpy(), strlcat(), and snprintf(). In preparation for removing the deprecated strlcat() API[1], use struct seq_buf to incrementally build synusb->name, and format synusb->phys with snprintf() after generating the USB path. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini:1.5-Pro-002 [editor_update_file, make_kernel_build_single_file, test_runner_run_kunit_test] Signed-off-by: Bill Wendling <morbo@google.com> --- Cc: Russell King <linux@armlinux.org.uk> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: WANG Xuerui <kernel@xen0n.name> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: Thomas Gleixner <tglx@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@gmail.com> Cc: Simona Vetter <simona@ffwll.ch> Cc: Matthew Brost <matthew.brost@intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Matthias Schwarzott <zzam@gentoo.org> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Tony Nguyen <anthony.l.nguyen@intel.com> Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com> Cc: Andrew Lunn <andrew+netdev@lunn.ch> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Arend van Spriel <arend.vanspriel@broadcom.com> Cc: Rob Herring <robh@kernel.org> Cc: Saravana Kannan <saravanak@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Cc: Peter Griffin <peter.griffin@linaro.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Linus Walleij <linusw@kernel.org> Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com> Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> Cc: "Martin K. Petersen" <mkp@kernel.org> Cc: Trond Myklebust <trondmy@kernel.org> Cc: Anna Schumaker <anna@kernel.org> Cc: Mike Marshall <hubcap@omnibond.com> Cc: Martin Brandenburg <martin@omnibond.com> Cc: Kees Cook <kees@kernel.org> Cc: Jiri Pirko <jiri@resnulli.us> Cc: Simon Horman <horms@kernel.org> Cc: Chuck Lever <cel@kernel.org> Cc: Jeff Layton <jlayton@kernel.org> Cc: NeilBrown <neil@brown.name> Cc: Olga Kornievskaia <okorniev@redhat.com> Cc: Dai Ngo <Dai.Ngo@oracle.com> Cc: Tom Talpey <tom@talpey.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: Bill Wendling <morbo@google.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: "Mike Rapoport (Microsoft)" <rppt@kernel.org> Cc: Kanglong Wang <redacted> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Qiang Ma <redacted> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Pengpeng Hou <redacted> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Breno Leitao <leitao@debian.org> Cc: Thorsten Blum <blum@kernel.org> Cc: Harshit Mogalapalli <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Lyude Paul <lyude@redhat.com> Cc: Ashutosh Desai <redacted> Cc: Imre Deak <redacted> Cc: Dmitry Baryshkov <redacted> Cc: Johan Hovold <johan@kernel.org> Cc: Johannes Berg <redacted> Cc: Miri Korenblit <miriam.rachel.korenblit@intel.com> Cc: Alexander Stein <redacted> Cc: Cryolitia PukNgae <cryolitia@uniontech.com> Cc: Jiaming Zhang <redacted> Cc: Will Porter <redacted> Cc: Cen Zhang <redacted> Cc: "Cássio Gabriel" <redacted> Cc: Rong Zhang <redacted> Cc: Arun Raghavan <redacted> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-edac@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: brcm80211@lists.linux.dev Cc: brcm80211-dev-list.pdl@broadcom.com Cc: devicetree@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-nfs@vger.kernel.org Cc: devel@lists.orangefs.org Cc: linux-hardening@vger.kernel.org Cc: linux-sound@vger.kernel.org --- drivers/input/mouse/synaptics_usb.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c
index 880a0c79148c..d13d2d6202ee 100644
--- a/drivers/input/mouse/synaptics_usb.c
+++ b/drivers/input/mouse/synaptics_usb.c@@ -41,6 +41,7 @@ #include <linux/usb.h> #include <linux/input.h> #include <linux/usb/input.h> +#include <linux/seq_buf.h> #define USB_VENDOR_ID_SYNAPTICS 0x06cb #define USB_DEVICE_ID_SYNAPTICS_TP 0x0001 /* Synaptics USB TouchPad */
@@ -278,6 +279,8 @@ static int synusb_probe(struct usb_interface *intf, struct input_dev *input_dev; unsigned int intf_num = intf->cur_altsetting->desc.bInterfaceNumber; unsigned int altsetting = min(intf->num_altsetting, 1U); + struct seq_buf s; + char path[64]; int error; error = usb_set_interface(udev, intf_num, altsetting);
@@ -334,27 +337,29 @@ static int synusb_probe(struct usb_interface *intf, ep->bInterval); synusb->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + seq_buf_init(&s, synusb->name, sizeof(synusb->name)); + if (udev->manufacturer) - strscpy(synusb->name, udev->manufacturer, - sizeof(synusb->name)); + seq_buf_puts(&s, udev->manufacturer); if (udev->product) { if (udev->manufacturer) - strlcat(synusb->name, " ", sizeof(synusb->name)); - strlcat(synusb->name, udev->product, sizeof(synusb->name)); + seq_buf_puts(&s, " "); + seq_buf_puts(&s, udev->product); } - if (!strlen(synusb->name)) - snprintf(synusb->name, sizeof(synusb->name), - "USB Synaptics Device %04x:%04x", - le16_to_cpu(udev->descriptor.idVendor), - le16_to_cpu(udev->descriptor.idProduct)); + if (!seq_buf_used(&s)) + seq_buf_printf(&s, "USB Synaptics Device %04x:%04x", + le16_to_cpu(udev->descriptor.idVendor), + le16_to_cpu(udev->descriptor.idProduct)); if (synusb->flags & SYNUSB_STICK) - strlcat(synusb->name, " (Stick)", sizeof(synusb->name)); + seq_buf_puts(&s, " (Stick)"); - usb_make_path(udev, synusb->phys, sizeof(synusb->phys)); - strlcat(synusb->phys, "/input0", sizeof(synusb->phys)); + seq_buf_str(&s); + + usb_make_path(udev, path, sizeof(path)); + snprintf(synusb->phys, sizeof(synusb->phys), "%s/input0", path); input_dev->name = synusb->name; input_dev->phys = synusb->phys;
--
2.55.0.1032.g73a4cd73de-goog