aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c3
-rw-r--r--net/core/utils.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 0b48e294aafe..94e642ee6e2b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -626,7 +626,7 @@ struct net_device * dev_get_by_flags(unsigned short if_flags, unsigned short mas
626 * Network device names need to be valid file names to 626 * Network device names need to be valid file names to
627 * to allow sysfs to work 627 * to allow sysfs to work
628 */ 628 */
629static int dev_valid_name(const char *name) 629int dev_valid_name(const char *name)
630{ 630{
631 return !(*name == '\0' 631 return !(*name == '\0'
632 || !strcmp(name, ".") 632 || !strcmp(name, ".")
@@ -3269,6 +3269,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
3269EXPORT_SYMBOL(__dev_get_by_name); 3269EXPORT_SYMBOL(__dev_get_by_name);
3270EXPORT_SYMBOL(__dev_remove_pack); 3270EXPORT_SYMBOL(__dev_remove_pack);
3271EXPORT_SYMBOL(__skb_linearize); 3271EXPORT_SYMBOL(__skb_linearize);
3272EXPORT_SYMBOL(dev_valid_name);
3272EXPORT_SYMBOL(dev_add_pack); 3273EXPORT_SYMBOL(dev_add_pack);
3273EXPORT_SYMBOL(dev_alloc_name); 3274EXPORT_SYMBOL(dev_alloc_name);
3274EXPORT_SYMBOL(dev_close); 3275EXPORT_SYMBOL(dev_close);
diff --git a/net/core/utils.c b/net/core/utils.c
index 7b5970fc9e40..587eb7787deb 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -175,7 +175,7 @@ __u32 in_aton(const char *str)
175 if (*str != '\0') 175 if (*str != '\0')
176 { 176 {
177 val = 0; 177 val = 0;
178 while (*str != '\0' && *str != '.') 178 while (*str != '\0' && *str != '.' && *str != '\n')
179 { 179 {
180 val *= 10; 180 val *= 10;
181 val += *str - '0'; 181 val += *str - '0';