diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-08-08 00:33:25 +0000 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-10 16:10:57 -0500 |
commit | 197365095b482ed4f3ffef8d4534b4708b261137 (patch) | |
tree | 1aaf7c7153b8b60b88a416fc36954d2c18450ed9 /net | |
parent | 57f8570a279005ca08905f68fa0ca3eeb86213e7 (diff) |
net/core: Fix potential memory leak in dev_set_alias()
commit 7364e445f62825758fa61195d237a5b8ecdd06ec upstream.
Do not leak memory by updating pointer with potentially NULL realloc return value.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 253b409fe3ab..3dbbba137c93 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1034,6 +1034,8 @@ rollback: */ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) { + char *new_ifalias; + ASSERT_RTNL(); if (len >= IFALIASZ) @@ -1047,9 +1049,10 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) return 0; } - dev->ifalias = krealloc(dev->ifalias, len + 1, GFP_KERNEL); - if (!dev->ifalias) + new_ifalias = krealloc(dev->ifalias, len + 1, GFP_KERNEL); + if (!new_ifalias) return -ENOMEM; + dev->ifalias = new_ifalias; strlcpy(dev->ifalias, alias, len+1); return len; |