From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC8C426ED41; Fri, 9 Jan 2026 12:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961480; cv=none; b=AmO4DtEAw3Ta5QsxntjAXLlGY+l7BdBbnbSZfJYv7ZxsoUcLXOXdu2ggriFvTjmHHQ765soXV4417gBhVqH5N+VsZMnMuryC1DO6JX9oZxKMWFKHkb7mwjfynLM7wFWLGFMzATOgUmJ38YIANeJlRkZzVUpWHCPs9BksevjSzA8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961480; c=relaxed/simple; bh=fbXnkkzQt97F7mr2E8Bjuc4xPI69rlaaLH7+3ubFWW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S5plISGKr+cJvpYfzoncmW5AR9WFIyKCcAu8p00qVpSU30XqWkFz3LXhV/sgWZMu+lqPwVVaTQ4XXcMMlJfNKdRx2dDnWL6RgnqXkFxLvmISTDG/uv1M5B35xBBni4r1zhJZEPVVYwX9Jvs8KiMgMOy49E+ztjduBmdQWuWnBHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NXX3j4Bn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NXX3j4Bn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37CD9C4CEF1; Fri, 9 Jan 2026 12:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767961480; bh=fbXnkkzQt97F7mr2E8Bjuc4xPI69rlaaLH7+3ubFWW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXX3j4BnpaC1J8QIzfaJPe9Yb17i5V11HQGkVTP11W1jkUi8f6ZjhkrZKpyFIXr44 ho8meP+qFZARrFgJkYWaiB6kkrKgcdsbcRfjr+Q1V25Lv9bA4Tjig93NzCLNibIK2p gLPq6HMVw0l6NGjzVgwCuxPfj4RD9gWmZzkzKjA0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Azeem Shaikh , Kees Cook , Lee Jones , Sasha Levin Subject: [PATCH 6.1 005/634] leds: Replace all non-returning strlcpy with strscpy Date: Fri, 9 Jan 2026 12:34:43 +0100 Message-ID: <20260109112117.625063712@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112117.407257400@linuxfoundation.org> References: <20260109112117.407257400@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Azeem Shaikh [ Upstream commit bf4a35e9201d30b63a8d276797d6ecfaa596ccd3 ] strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy(). No return values were used, so direct replacement is safe. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy [2] https://github.com/KSPP/linux/issues/89 Signed-off-by: Azeem Shaikh Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230523021451.2406362-1-azeemshaikh38@gmail.com Signed-off-by: Lee Jones Stable-dep-of: ccc35ff2fd29 ("leds: spi-byte: Use devm_led_classdev_register_ext()") Signed-off-by: Sasha Levin --- drivers/leds/flash/leds-aat1290.c | 2 +- drivers/leds/led-class.c | 2 +- drivers/leds/leds-spi-byte.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/leds/flash/leds-aat1290.c b/drivers/leds/flash/leds-aat1290.c index 589484b22c796..f12ecb2c65803 100644 --- a/drivers/leds/flash/leds-aat1290.c +++ b/drivers/leds/flash/leds-aat1290.c @@ -425,7 +425,7 @@ static void aat1290_init_v4l2_flash_config(struct aat1290_led *led, struct led_classdev *led_cdev = &led->fled_cdev.led_cdev; struct led_flash_setting *s; - strlcpy(v4l2_sd_cfg->dev_name, led_cdev->dev->kobj.name, + strscpy(v4l2_sd_cfg->dev_name, led_cdev->dev->kobj.name, sizeof(v4l2_sd_cfg->dev_name)); s = &v4l2_sd_cfg->intensity; diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 93fdca5c7dc5d..923138c808ca2 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -321,7 +321,7 @@ static int led_classdev_next_name(const char *init_name, char *name, int ret = 0; struct device *dev; - strlcpy(name, init_name, len); + strscpy(name, init_name, len); while ((ret < len) && (dev = class_find_device_by_name(leds_class, name))) { diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c index 6883d3ba382f9..065a2bcb7c14b 100644 --- a/drivers/leds/leds-spi-byte.c +++ b/drivers/leds/leds-spi-byte.c @@ -97,7 +97,7 @@ static int spi_byte_probe(struct spi_device *spi) return -ENOMEM; of_property_read_string(child, "label", &name); - strlcpy(led->name, name, sizeof(led->name)); + strscpy(led->name, name, sizeof(led->name)); led->spi = spi; mutex_init(&led->mutex); led->cdef = device_get_match_data(dev); -- 2.51.0