From ad5f90debb00fc908420f308f811139b6e5b1fad Mon Sep 17 00:00:00 2001 From: Wang Chen Date: Tue, 1 Jul 2008 19:57:19 -0700 Subject: [PATCH] --- yaml --- r: 98583 b: refs/heads/master c: 93b3cff9915322d6fa36bac0064714a7076230e4 h: refs/heads/master i: 98581: 2ea97fe599b664f8ae8c23a0fba0eb905601913b 98579: 20db96ce72e729770c53dc985107359d541e8dd8 98575: 22bfe765ca97051191bbb43e202de69ada89b0cf v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa336f4adfc7..f5156c71500b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fde8a076940969d32805b853efdce8b988d7dda +refs/heads/master: 93b3cff9915322d6fa36bac0064714a7076230e4 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 56b46579ff4e..fca23a3bf12c 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -454,7 +454,7 @@ static int netdev_boot_setup_add(char *name, struct ifmap *map) for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { if (s[i].name[0] == '\0' || s[i].name[0] == ' ') { memset(s[i].name, 0, sizeof(s[i].name)); - strcpy(s[i].name, name); + strlcpy(s[i].name, name, IFNAMSIZ); memcpy(&s[i].map, map, sizeof(s[i].map)); break; } @@ -479,7 +479,7 @@ int netdev_boot_setup_check(struct net_device *dev) for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { if (s[i].name[0] != '\0' && s[i].name[0] != ' ' && - !strncmp(dev->name, s[i].name, strlen(s[i].name))) { + !strcmp(dev->name, s[i].name)) { dev->irq = s[i].map.irq; dev->base_addr = s[i].map.base_addr; dev->mem_start = s[i].map.mem_start;