---

yaml --- r: 111878 b: refs/heads/master c: 152cbcf h: refs/heads/master v: v3
git-mirror · Sep 24, 2008 · 7d6a91d · 7d6a91d
1 parent 68b4de9
commit 7d6a91d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa53ebac42d3de04619c813f5f6628ca2a7ce97f
+refs/heads/master: 152cbcf94baec68b45832db5024184906ab798b1
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -967,6 +967,14 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len)
 	if (len >= IFALIASZ)
 		return -EINVAL;
 
+	if (!len) {
+		if (dev->ifalias) {
+			kfree(dev->ifalias);
+			dev->ifalias = NULL;
+		}
+		return 0;
+	}
+
 	dev->ifalias = krealloc(dev->ifalias, len+1, GFP_KERNEL);
 	if (!dev->ifalias)
 		return -ENOMEM;