diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-08-08 00:33:25 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-08 16:06:23 -0700 |
commit | 7364e445f62825758fa61195d237a5b8ecdd06ec (patch) | |
tree | 78f93fbe4f9d04b0c547a08b4c40f78071c741eb /net | |
parent | 47dffc7547ed3b105dabd570ed864347687beac2 (diff) | |
download | linux-3.10-7364e445f62825758fa61195d237a5b8ecdd06ec.tar.gz linux-3.10-7364e445f62825758fa61195d237a5b8ecdd06ec.tar.bz2 linux-3.10-7364e445f62825758fa61195d237a5b8ecdd06ec.zip |
net/core: Fix potential memory leak in dev_set_alias()
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>
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 f91abf80016..a39354ee143 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1055,6 +1055,8 @@ rollback: */ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) { + char *new_ifalias; + ASSERT_RTNL(); if (len >= IFALIASZ) @@ -1068,9 +1070,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; |