diff options
author | Alexander Potapenko <glider@google.com> | 2017-06-06 15:56:54 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-07 18:58:45 +0200 |
commit | c28294b941232931fbd714099798eb7aa7e865d7 (patch) | |
tree | 34ebac6259d426d260ad707793f17cc3ae8df66b /net/core/dev.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-c28294b941232931fbd714099798eb7aa7e865d7.tar.xz linux-c28294b941232931fbd714099798eb7aa7e865d7.zip |
net: don't call strlen on non-terminated string in dev_set_alias()
KMSAN reported a use of uninitialized memory in dev_set_alias(),
which was caused by calling strlcpy() (which in turn called strlen())
on the user-supplied non-terminated string.
Signed-off-by: Alexander Potapenko <glider@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index fca407b4a6ea..84e1e86a4bce 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1253,8 +1253,9 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) if (!new_ifalias) return -ENOMEM; dev->ifalias = new_ifalias; + memcpy(dev->ifalias, alias, len); + dev->ifalias[len] = 0; - strlcpy(dev->ifalias, alias, len+1); return len; } |