diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-07-18 14:31:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-07-18 14:31:54 +0800 |
| commit | 16e243013beb93902693c4bb90e4348c99588429 (patch) | |
| tree | 6a5858d948085974ef1f26bb1e4b546cfb44cfc5 /net/core/dev.c | |
| parent | 2120557722577d8cff75a33a799ad15582dbd8ef (diff) | |
| parent | 5289d9c979092878f2bf741d8b365ef7565fb6db (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.07-android
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 87b8754f34ac..524d8b28e690 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1246,8 +1246,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; } |