diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-08-08 11:28:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-08 11:28:40 -0700 |
| commit | b3a598eb0d6b5c88ef8284c5dc95986eea365054 (patch) | |
| tree | 21a3ee04b333c4ec52a73045aba305f3a5b5c58f /net/batman-adv/sysfs.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| parent | batman-adv: BATMAN_V: aggregate OGMv2 packets (diff) | |
| download | linux-dev-b3a598eb0d6b5c88ef8284c5dc95986eea365054.tar.xz linux-dev-b3a598eb0d6b5c88ef8284c5dc95986eea365054.zip | |
Merge tag 'batadv-next-for-davem-20190808' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Replace usage of strlcpy with strscpy, by Sven Eckelmann
- Add OGMv2 per-interface queue and aggregations, by Linus Luessing
(2 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/sysfs.c')
| -rw-r--r-- | net/batman-adv/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 1efcb97039cd..e5bbc28ed12c 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1070,7 +1070,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, dev_hold(net_dev); INIT_WORK(&store_work->work, batadv_store_mesh_iface_work); store_work->net_dev = net_dev; - strlcpy(store_work->soft_iface_name, buff, + strscpy(store_work->soft_iface_name, buff, sizeof(store_work->soft_iface_name)); queue_work(batadv_event_workqueue, &store_work->work); |