From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.228.9 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792653014; b=W+NhK1b4oKLTkfJmwbbjBNgIkZJLYICxgf2luwxf4BR5MGXNSj81sT3kTWbjkvBCN9kj DKIa9Q+gqrTQrp4HTZrmcpH5rogtrY70LkVrToocPUWSeYCnuUnRnqyso3tl9YB6P8qoe 4ovNX7sRACXtA7dJyJa355EqadiMdA3RTZPkCg4CX1deh4miCxON65vBbe4JGvPBwfYBL p1ojKy8zJhNNZIJbhBgAvi/a0K0MTWuIVaGQo/Rwc/0fw7K77wdFHUx378P1FWDhdciaO XFv54EvjdqCgaxcBqiQTNdoC4ydWsxOOdAdqSly9chLpZ/71ssIcmDlu08/S2NRf9mA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792653014; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=nnZ0MwCj80U+rG8upbc3A6/J8KNZsuBJGtpG/de36Io=; b=QfMgF9RzGEAdMxK2kB322jGi1G3XTsuifTc0SSThSiJOrQCGiSWbMGkXreUhYfJneN0v SIP09D507CTx0EU8CgJIETGsurcUiI5tplxG09Qdewd3UaDCtkFk8/JwuJqIZEA4gCJFR OiK5DICKaERhYHdQXwpfCBw41iabC0Sqq+tgVybdWyB+ulgh5g6DMXkkVYAkQy4sqefSv ij8cV9gQOwaHCoKNgJqWGkB2mxTcT/wo5xW0fOtqVvpXIKIGKf4ToWxFDlRCe5/YrG2pm 0muq7cs9HnMgmLVAxtAcozv9VvfIPehQ5JqmCAhs4mAxsI6TMhZ/i5oDsqLbW9BK+3w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=elYBUVHv; arc=none smtp.remote-ip=74.125.228.9 Received: from mail-pz2-f9.google.com (mail-pz2-f9.google.com [74.125.228.9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C47E606A31A for ; Thu, 22 Oct 2026 07:10:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4C47E606A31A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=elYBUVHv Received: by mail-pz2-f9.google.com with SMTP id 41be03b00d2f7-cd65a511e43so571642a12.1 for ; Thu, 22 Oct 2026 00:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792653014; x=1793257814; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=nnZ0MwCj80U+rG8upbc3A6/J8KNZsuBJGtpG/de36Io=; b=elYBUVHv1G/+HQcaNkxI5vFRLDZdl4qCwIUkcU/qNwNUpTSV4qXGzPUkwBnSmr4nxd wwVezuvR6Ife3TvQzjo+6K7A6wFvxXJCNcmsuuvTJNcBisvkxV+yDcLbpa572clLuVCI 9fKil/njdza/R6iwWl11nH61WeT5Epgq0Zykr/jDqP5yuVO47whXgjdQwt6gp8OmSs0N idqR9tjE6FPUjivxfYkN5TBNgTz/JAp3q7tdvuFrtnQjJEmwxm3md7ag84qYIaP0tcvU NZsQ8W481LlK7Rdco81h88o/EYxdK/htfSER/FoyHgzzdJITP+DHQbednvYEQYj1EVzy tMQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792653014; x=1793257814; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=nnZ0MwCj80U+rG8upbc3A6/J8KNZsuBJGtpG/de36Io=; b=B1uE66Bsw0ssR4OVNxM7lreMwoXKxvh1Jg22yHgW40hHnawHdAgGRwV1FONZ1Iw/pn EJcC59QAjsiqibP2GBC75nLmG4R93nYg0oUgMdPdY198g6KfIZbqJdfrFYXSnXya7dqh lzKzl9Pk44BjqDITU8xpyZYzncWTfJjc5Ds34jMpapLWM4UUmVuKTJPLsD54D5+XLTpb KeBbIwQSVpFxBw+AqW2Vn1BNPJBxo/T7T72wAOzON/r4cdoRWfmRclSsyIKxR+VDMhrm GYLz//nGm47Kdgp4EJR19Y0qZT4J53zoM3zGMFNDjT/LP/tvHc0LMjGpBc2+kGyFWxZP M56g== X-Forwarded-Encrypted: i=1; AKwUvByVg0eYoE5ljXkz1AUX4m+H+OJNheHxjuFNmulu6Rd1UN0a2yNwDC00tFtEnMiEsvfjefNezz75zl4MupM=@vger.kernel.org X-Gm-Message-State: AFq9FYKiFkkfGkeCYaABeP7nwW+ixp/jqarMSstM4hr3DRLa95lQKi6I HRNx566NEpsh42guJeniRgppjX1ktjRwGfRMQ8gRv6Q5kXrI/4UV9h6o X-Gm-Gg: AYBFou3wduzsWOMwD10KCNNklkayhTcwgDJ34Mcd5/2h8KASCmC2EMbZsVotbrmJtil uvdIGIUzivcHylKaPph/QXUSKGfz2XwbsRf4kBKCSpwQ1srpel4fSYd/sThAf80+OiK+r1bdlFd R7RAcWkhG7/FSkvep72Pe9G6wxk2eFl3jB1SecNgwQl6delfoMoQqn0zsTZziSjG5hOOTM5Y6RG W7VB6se7hFPXIj9lNWL5cB+E+h1LSyau0M43Ooq1JAtfWfpj7aze5ePnbIxtwAoR8UboHKNAsfc kZRN6aiidJCNxpcAcqF5lj03BZuhROII+Kp2/QgaxX4iJ+VLIPXs6vU6IBxfV8rdrSTwSaOV8he YkpPdulSJ9KcTrekEnhiC3qXSM408qNtN7hLQE+ocS8meVTcsgHqu1eq63igLCpNymFFzs+7EOZ NyEpVqEd8ZbnYOzN3h7vuKZ7Fx5gW0Vmq9sTVHXaSFiLYpVjHPnggaacS8smmtI2Iu7Mo2YwfkJ MPh8JQQsMi3hMnwuCXxgs5qIzMMKI0eLY6O7qd+ueRQQTPnQ3ueBznMPDYCqpsR3X565kRcYw== X-Received: by 2002:a05:6a00:3020:b0:882:e3a6:27c9 with SMTP id d2e1a72fcca58-8a089d0f2f8mr3839994b3a.30.1792653013784; Thu, 22 Oct 2026 00:10:13 -0700 (PDT) Received: from J4f-Laptop.localdomain ([183.36.237.113]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8a0894b49d1sm1706039b3a.12.2026.10.22.00.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 00:10:11 -0700 (PDT) From: Shihuang Liu To: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Dmitry Torokhov , Marcus Folkesson , Ville Syrjala , Henk Vergonet , Henrik Rydberg , Alejandro Colomar , Shihuang Liu Subject: [PATCH v2 RESEND 4/6] Input: mouse - use usb_make_subpath() Date: Thu, 22 Oct 2026 15:09:27 +0800 Message-ID: <20261022070929.20820-5-shlomojune6@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261022070929.20820-1-shlomojune6@gmail.com> References: <20261021123146.17202-1-shlomojune6@gmail.com> <20261022070929.20820-1-shlomojune6@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The appletouch, bcm5974 and synaptics_usb drivers build their input device physical paths by appending "/input0" with strlcat() after usb_make_path(). In preparation for removing the deprecated strlcat() API [1], replace each pair of calls with usb_make_subpath(). The helper formats the USB path and the "input0" subpath in one call, avoiding a separate buffer scan and append operation. Link: https://github.com/KSPP/linux/issues/370 [1] Signed-off-by: Shihuang Liu --- drivers/input/mouse/appletouch.c | 3 +-- drivers/input/mouse/bcm5974.c | 3 +-- drivers/input/mouse/synaptics_usb.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c index eebeb57515e1c..b536dfae427de 100644 --- a/drivers/input/mouse/appletouch.c +++ b/drivers/input/mouse/appletouch.c @@ -874,8 +874,7 @@ static int atp_probe(struct usb_interface *iface, if (error) goto err_free_buffer; - usb_make_path(udev, dev->phys, sizeof(dev->phys)); - strlcat(dev->phys, "/input0", sizeof(dev->phys)); + usb_make_subpath(udev, dev->phys, sizeof(dev->phys), "input0"); input_dev->name = "appletouch"; input_dev->phys = dev->phys; diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index e772bac3b64c0..0732bf3a97adc 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -989,8 +989,7 @@ static int bcm5974_probe(struct usb_interface *iface, dev->tp_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; /* create bcm5974 device */ - usb_make_path(udev, dev->phys, sizeof(dev->phys)); - strlcat(dev->phys, "/input0", sizeof(dev->phys)); + usb_make_subpath(udev, dev->phys, sizeof(dev->phys), "input0"); input_dev->name = "bcm5974"; input_dev->phys = dev->phys; diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c index 880a0c79148cd..7da22118ce576 100644 --- a/drivers/input/mouse/synaptics_usb.c +++ b/drivers/input/mouse/synaptics_usb.c @@ -353,8 +353,7 @@ static int synusb_probe(struct usb_interface *intf, if (synusb->flags & SYNUSB_STICK) strlcat(synusb->name, " (Stick)", sizeof(synusb->name)); - usb_make_path(udev, synusb->phys, sizeof(synusb->phys)); - strlcat(synusb->phys, "/input0", sizeof(synusb->phys)); + usb_make_subpath(udev, synusb->phys, sizeof(synusb->phys), "input0"); input_dev->name = synusb->name; input_dev->phys = synusb->phys; -- 2.43.0