From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: "Pavel Machek" <pavel@ucw.cz>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Jacek Anaszewski" <jacek.anaszewski@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-leds@vger.kernel.org
Subject: [PATCH v2 1/6] leds: netdev trigger: use memcpy in device_name_store
Date: Thu, 14 Mar 2019 15:06:14 +0100 [thread overview]
Message-ID: <20190314140619.3309-2-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <20190314140619.3309-1-linux@rasmusvillemoes.dk>
If userspace doesn't end the input with a newline (which can easily
happen if the write happens from a C program that does write(fd,
iface, strlen(iface))), we may end up including garbage from a
previous, longer value in the device_name. For example
# cat device_name
# printf 'eth12' > device_name
# cat device_name
eth12
# printf 'eth3' > device_name
# cat device_name
eth32
I highly doubt anybody is relying on this behaviour, so switch to
simply copying the bytes (we've already checked that size is <
IFNAMSIZ) and unconditionally zero-terminate it; of course, we also
still have to strip a trailing newline.
This is also preparation for future patches.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
drivers/leds/trigger/ledtrig-netdev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index 3dd3ed46d473..8d476b92f58c 100644
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -122,7 +122,8 @@ static ssize_t device_name_store(struct device *dev,
trigger_data->net_dev = NULL;
}
- strncpy(trigger_data->device_name, buf, size);
+ memcpy(trigger_data->device_name, buf, size);
+ trigger_data->device_name[size] = 0;
if (size > 0 && trigger_data->device_name[size - 1] == '\n')
trigger_data->device_name[size - 1] = 0;
--
2.20.1
next prev parent reply other threads:[~2019-03-14 14:06 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 10:59 replacement for CAN_LEDS Rasmus Villemoes
2019-03-11 14:42 ` Pavel Machek
2019-03-13 20:26 ` [PATCH 0/4] leds: netdev trigger: allow setting initial values in device tree Rasmus Villemoes
2019-03-13 20:26 ` [PATCH 1/4] leds: netdev trigger: use memcpy in device_name_store Rasmus Villemoes
2019-03-14 9:29 ` Uwe Kleine-König
2019-03-14 9:57 ` Rasmus Villemoes
2019-03-14 10:04 ` Uwe Kleine-König
2019-03-14 10:14 ` Pavel Machek
2019-03-14 10:54 ` Rasmus Villemoes
2019-03-14 12:16 ` Pavel Machek
2019-03-13 20:26 ` [PATCH 2/4] leds: netdev trigger: factor out middle part of device_name_store Rasmus Villemoes
2019-03-14 9:31 ` Uwe Kleine-König
2019-03-14 9:57 ` Rasmus Villemoes
2019-03-14 10:15 ` Pavel Machek
2019-03-14 10:20 ` Uwe Kleine-König
2019-03-13 20:26 ` [PATCH 3/4] leds: netdev trigger: add documentation to leds/common.txt Rasmus Villemoes
2019-03-13 20:26 ` [PATCH 4/4] leds: netdev trigger: allow setting initial values in device tree Rasmus Villemoes
2019-03-14 9:36 ` Uwe Kleine-König
2019-03-14 10:28 ` Rasmus Villemoes
2019-03-14 10:29 ` Pavel Machek
2019-03-14 11:26 ` Rasmus Villemoes
2019-03-14 12:00 ` Pavel Machek
2019-03-14 13:19 ` Rasmus Villemoes
2019-03-17 19:11 ` Pavel Machek
2019-03-24 20:39 ` Rasmus Villemoes
2019-03-14 10:32 ` Jacek Anaszewski
2019-03-14 14:06 ` [PATCH v2 0/6] " Rasmus Villemoes
2019-03-14 14:06 ` Rasmus Villemoes [this message]
2019-03-18 11:20 ` [PATCH v2 1/6] leds: netdev trigger: use memcpy in device_name_store Pavel Machek
2019-03-26 19:53 ` Jacek Anaszewski
2019-03-27 15:26 ` Rasmus Villemoes
2019-03-27 21:20 ` Jacek Anaszewski
2019-03-27 21:31 ` Rasmus Villemoes
2019-03-27 21:45 ` Jacek Anaszewski
2019-03-14 14:06 ` [PATCH v2 2/6] leds: netdev trigger: factor out middle part of device_name_store Rasmus Villemoes
2019-03-18 11:24 ` Pavel Machek
2019-03-14 14:06 ` [PATCH v2 3/6] leds: netdev trigger: move newline handling back to device_name_store Rasmus Villemoes
2019-03-18 11:25 ` Pavel Machek
2019-03-14 14:06 ` [PATCH v2 4/6] leds: netdev trigger: move name length checking to netdev_trig_set_device Rasmus Villemoes
2019-03-18 11:26 ` Pavel Machek
2019-03-14 14:06 ` [PATCH v2 5/6] leds: netdev trigger: add documentation to leds/common.txt Rasmus Villemoes
2019-03-14 14:06 ` [PATCH v2 6/6] leds: netdev trigger: allow setting initial values in device tree Rasmus Villemoes
2019-03-14 14:24 ` Jacek Anaszewski
2019-03-14 15:05 ` Rasmus Villemoes
2019-03-14 15:36 ` Jacek Anaszewski
2019-03-18 11:54 ` Pavel Machek
2019-03-28 16:28 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190314140619.3309-2-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).