diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-08-08 00:33:25 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-09-19 15:04:48 +0100 |
| commit | 47be27f0e491483c16285ed023874929824b5190 (patch) | |
| tree | 7796a06315590d3922a90bc37335581e8419f86d /net/core/dev.c | |
| parent | 3f37c3bd4cded42d856f5f9d40a830bfefa57b58 (diff) | |
| download | kernel_samsung_smdk4412-47be27f0e491483c16285ed023874929824b5190.zip kernel_samsung_smdk4412-47be27f0e491483c16285ed023874929824b5190.tar.gz kernel_samsung_smdk4412-47be27f0e491483c16285ed023874929824b5190.tar.bz2 | |
net/core: Fix potential memory leak in dev_set_alias()
[ Upstream commit 7364e445f62825758fa61195d237a5b8ecdd06ec ]
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/dev.c')
| -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 e6f2635..75da76d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1059,6 +1059,8 @@ rollback: */ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) { + char *new_ifalias; + ASSERT_RTNL(); if (len >= IFALIASZ) @@ -1072,9 +1074,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; |