From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.227.138 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792653026; b=cWI/Ei21Hp9x66JA9Ubd4yfaBJNOKEITfr6V13ca27u8T6oCBkXDCYIxvCfsGk6t17ND M5+L5Wae8IF1dgo610Ru4lpbyYVKwdn6yZHIWvf/vDOxxGMOBreEmdHlCu3TGMJ/EyXkN 3W0JhN4LCiC0CaZ+rM4/Gw/mlNR/bA1Fy2HC/2nnuw4wdQbOsGdXzojpqdzu6ABdtW4et xDUY39kJeBRCAuZ85uuumTGl5Blb4WKjhQgRq7FnG7DvXRQy+fp7azN6cMT9Vhz3YrB4K PSREfxEi9i1PZHP2GMvepxwcQVMzjHY8YocR1gG8zAu+rmRrZ3TFRA1wCEgV5jK/W0w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792653026; 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=UlfXExQXyhG92dzdrPUvVvWcK6W0MmRTGKrmc+yyUUM=; b=nOggP4g2mYbFtsbjiFOLP3X5/SKa4BOf3hhpg6fmo3XAh3j+em8ZiQ3xdpiPVKXuVUkX 52f3V8alxRhvSsutHGzDSP7msYLBJtmFRsawJcQU3dOAG6ZIqZAl4nwF+tNCgxqoun34l JxXflOij4Ft4zCCa5YOxIXnCLBw/anMfGcq9jhQFjAio4JGGw3fE0NxUkARBiJU1JEDeE 1CVBrnGDhPbFI0yrNqKm2F7WYCNOlY/JTOF/3wEbUYW8i5olixIO6fUrux+E1wZGQkP5I if6LChdF4/GWHAAHkA+weVhPOcu4QHWWklEeuyLFI5m3U1O74Q7UD2m20PSi93Q5ryw== 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=qFUMBxMa; arc=none smtp.remote-ip=74.125.227.138 Received: from mail-pj2-f10.google.com (mail-pj2-f10.google.com [74.125.227.138]) (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 432D9606A31D for ; Thu, 22 Oct 2026 07:10:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 432D9606A31D 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=qFUMBxMa Received: by mail-pj2-f10.google.com with SMTP id 98e67ed59e1d1-3abe4821449so811528a91.1 for ; Thu, 22 Oct 2026 00:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792653025; x=1793257825; 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=UlfXExQXyhG92dzdrPUvVvWcK6W0MmRTGKrmc+yyUUM=; b=qFUMBxMaK6CdgDBTyOpMWCNdcpfDDqGdiQLb/pR1oPQYi6CKaowEzQBpBV0iOSwnVU n1Ka8uwLGD93La8MP63IB9EKMndadwJWLM7vk+135dSsI6liSrGFTLi4UEh/YQQ7xHUz 3L2MDkQdbK//LlcZEuy8jJr3RDvrbPp5fMWbVh6w3HBe5W4Pbq6v2FYBAt4FVakfLI7S amDIaOHHbjSRjkCVAnCyms2ivFmTinl7uvmRVWJvej8mlaWm9ZJHDdP+vwW66PKEJpKf YE2ngiPpfMh5FrXMlWKX2s23wVNEs1a1hMVnfPih+WL79F4ZIlp4iekknikNaemb6weY nLsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792653025; x=1793257825; 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=UlfXExQXyhG92dzdrPUvVvWcK6W0MmRTGKrmc+yyUUM=; b=2km0i0CoRc8qzVVZk6IZlFBv6hlRsXJRI2CtByqsEEYBuWLRZUtCQ064jGZPU+NFJM ohQpXjDbh6tVdh9/kxEMtWZ2htvIVaxgtUyhL3wodZz/VxDZ18DyUxCPOHg/cb3M/xRR Tf3ZkVKvJsFv5aNqJCoV1j7a603Tq7tcSIoVSB262ekqunuWztnKYaOKdIUMNlo8CISE B5lCRBFVTimZksfYpBWXYZIuXX95hJffPzN9DaKfRj7t3MHgsWC7uFR+wbu/3NSNJ0qx Wp74u0tLYB6NLLbTXYF13yzyR3Wf98QsrlAe/0sWZIcBLgVdrJYylpmxpx/t6FFCyIp0 4kSg== X-Forwarded-Encrypted: i=1; AKwUvBxEQfbQ0E6Dqpuo7jXYDjs4r6tUh5qtAMNUiZgymRydW0mn8n2lVO+zzVBiR0JpO5BoNI16XLiRaKc=@vger.kernel.org X-Gm-Message-State: AFq9FYI2aUmRdmJ0ZmbtpCnjHhrUDYYmFX+Kb/NDtQgGxzrRKATgVcWl ujp7J8hNday3M7JImq/6Sc5QO5LKoPM5eKuG9mvtaNe5iXDlE0htLKoJ X-Gm-Gg: AYBFou1HNa5DeNn6aGKrQbTf84UC8ywMey7+/oFTRzbD8ryEIFAHslZjK2ziLJYZ7Eb rVPvLyKHdtd61U3kkLGEewsH+SwkYdG9EsdyP01fJI+m5jsuHXIeO2GilIadkiSsffBPIDiMqYX rvxBCikCRzDLTUcBmkOMrapWgARbUkZMNW8UG3591YdpIVMUvu71xZKHKor4DnOgoJ1qiHdwCnE 1CkIQYUp9gHBye0eaF/l6y1FI5WLXPSmVOhl/SjXAqy8ucqV3F12cBNiOfbLqtxIOWHi60t0XLS 5yXoU8vpQaMdyFZwHPFbmh+zGbFnrablX1drSAJK8nBxyJZ5rHk9NDW9goAv5FMxXVTYXkFnJHZ Qbx9Qy2m/g0pUNwGXfdjV/GXRf7pCO/5rijtMT2+hfH7UFpG/sF2RoPG6Tc9xmEqOcqkR5Sa/Yg ef+ayX8wY3Us9qIMZOrPSoRHvMMIkDzNZ9og23xNCLx20s8V/m/pdzjqur1Nx49gKvTU5l8SVDa xjyQ5wrxb/XA+oODX6XrXnQM6vkEbracYL+7NxKvEJHBLNjCYaw1UziUULNjUBFeW1wPZWfkA== X-Received: by 2002:a05:6a00:2e17:b0:89f:4cd9:241a with SMTP id d2e1a72fcca58-8a089d45677mr3426736b3a.41.1792653024539; Thu, 22 Oct 2026 00:10:24 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 00:10:22 -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 6/6] Input: touchscreen - use usb_make_subpath() Date: Thu, 22 Oct 2026 15:09:29 +0800 Message-ID: <20261022070929.20820-7-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-usb@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 sur40 and usbtouchscreen 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/touchscreen/sur40.c | 3 +-- drivers/input/touchscreen/usbtouchscreen.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index 77ec2c94b91fd..7702eead123e2 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c @@ -690,8 +690,7 @@ static int sur40_probe(struct usb_interface *interface, /* Set up regular input device structure */ input->name = DRIVER_LONG; usb_to_input_id(usbdev, &input->id); - usb_make_path(usbdev, sur40->phys, sizeof(sur40->phys)); - strlcat(sur40->phys, "/input0", sizeof(sur40->phys)); + usb_make_subpath(usbdev, sur40->phys, sizeof(sur40->phys), "input0"); input->phys = sur40->phys; input->dev.parent = &interface->dev; diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index 0bbacb517c286..fd2b896675dee 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c @@ -1512,8 +1512,7 @@ static int usbtouch_probe(struct usb_interface *intf, le16_to_cpu(udev->descriptor.idVendor), le16_to_cpu(udev->descriptor.idProduct)); - usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys)); - strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys)); + usb_make_subpath(udev, usbtouch->phys, sizeof(usbtouch->phys), "input0"); input_dev->name = usbtouch->name; input_dev->phys = usbtouch->phys; -- 2.43.0