diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2012-08-08 00:33:25 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:29:35 -0700 |
| commit | caf2630c41a183b72e5d6211e5efd1457ac0c463 (patch) | |
| tree | 5bcd1cdd058be10d65ea4fb7a809c5b00ef41aaf /net | |
| parent | a348ed02b367a8a8307444724db5c8e96c90ac78 (diff) | |
| download | linux-3.10-caf2630c41a183b72e5d6211e5efd1457ac0c463.tar.gz linux-3.10-caf2630c41a183b72e5d6211e5efd1457ac0c463.tar.bz2 linux-3.10-caf2630c41a183b72e5d6211e5efd1457ac0c463.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 665730f06f3..a1e0355908e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1056,6 +1056,8 @@ rollback: */ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) { + char *new_ifalias; + ASSERT_RTNL(); if (len >= IFALIASZ) @@ -1069,9 +1071,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; |