summaryrefslogtreecommitdiff
path: root/recipes/net-tools/files/net-tools-1.60-interface_stack.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/net-tools/files/net-tools-1.60-interface_stack.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/net-tools/files/net-tools-1.60-interface_stack.patch')
-rw-r--r--recipes/net-tools/files/net-tools-1.60-interface_stack.patch115
1 files changed, 115 insertions, 0 deletions
diff --git a/recipes/net-tools/files/net-tools-1.60-interface_stack.patch b/recipes/net-tools/files/net-tools-1.60-interface_stack.patch
new file mode 100644
index 0000000000..c16f539753
--- /dev/null
+++ b/recipes/net-tools/files/net-tools-1.60-interface_stack.patch
@@ -0,0 +1,115 @@
+Bugzilla Bug 176714 – *** stack smashing detected ***: /sbin/ifconfig terminated
+
+--- lib/interface.c-old 2005-12-30 11:08:15.000000000 -0800
++++ lib/interface.c 2005-12-30 11:17:02.000000000 -0800
+@@ -201,10 +201,11 @@
+ return err;
+ }
+
+-static char *get_name(char *name, char *p)
++static char *get_name(char **namep, char *p)
+ {
+ while (isspace(*p))
+ p++;
++ char *name = *namep = p;
+ while (*p) {
+ if (isspace(*p))
+ break;
+@@ -305,9 +306,10 @@
+ {
+ static int proc_read;
+ FILE *fh;
+- char buf[512];
+ struct interface *ife;
+ int err;
++ char *line = NULL;
++ size_t linelen = 0;
+
+ if (proc_read)
+ return 0;
+@@ -320,8 +322,11 @@
+ _PATH_PROCNET_DEV, strerror(errno));
+ return if_readconf();
+ }
+- fgets(buf, sizeof buf, fh); /* eat line */
+- fgets(buf, sizeof buf, fh);
++ if (getline(&line, &linelen, fh) == -1 /* eat line */
++ || getline(&line, &linelen, fh) == -1) {
++ err = -1;
++ goto out;
++ }
+
+ #if 0 /* pretty, but can't cope with missing fields */
+ fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh,
+@@ -346,13 +351,13 @@
+ if (!fmt)
+ return -1;
+ #else
+- procnetdev_vsn = procnetdev_version(buf);
++ procnetdev_vsn = procnetdev_version(line);
+ #endif
+
+ err = 0;
+- while (fgets(buf, sizeof buf, fh)) {
+- char *s, name[IFNAMSIZ];
+- s = get_name(name, buf);
++ while (getline(&line, &linelen, fh) != -1) {
++ char *s, *name;
++ s = get_name(&name, line);
+ ife = add_interface(name);
+ get_dev_fields(s, ife);
+ ife->statistics_valid = 1;
+@@ -368,6 +373,8 @@
+ #if 0
+ free(fmt);
+ #endif
++ out:
++ free(line);
+ fclose(fh);
+ return err;
+ }
+@@ -376,8 +383,9 @@
+ static int if_readlist_rep(char *target, struct interface *ife)
+ {
+ FILE *fh;
+- char buf[512];
+ int err;
++ char *line = NULL;
++ size_t linelen = 0;
+
+ fh = fopen(_PATH_PROCNET_DEV, "r");
+ if (!fh) {
+@@ -385,15 +393,18 @@
+ _PATH_PROCNET_DEV, strerror(errno));
+ return if_readconf();
+ }
+- fgets(buf, sizeof buf, fh); /* eat line */
+- fgets(buf, sizeof buf, fh);
++ if (getline(&line, &linelen, fh) == -1 /* eat line */
++ || getline(&line, &linelen, fh) == -1) {
++ err = -1;
++ goto out;
++ }
+
+- procnetdev_vsn = procnetdev_version(buf);
++ procnetdev_vsn = procnetdev_version(line);
+
+ err = 0;
+- while (fgets(buf, sizeof buf, fh)) {
+- char *s, name[IFNAMSIZ];
+- s = get_name(name, buf);
++ while (getline(&line, &linelen, fh) != -1) {
++ char *s, *name;
++ s = get_name(&name, line);
+ get_dev_fields(s, ife);
+ if (target && !strcmp(target,name))
+ {
+@@ -406,6 +417,8 @@
+ err = -1;
+ }
+
++ out:
++ free(line);
+ fclose(fh);
+ return err;
+ }