summaryrefslogtreecommitdiff
path: root/package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch
blob: 2c5ef6b41f3a8be938f6cc2a55e7e6f1831ec9db (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From ea80044062500c7473cf214010576ea2681d8d2e Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Thu, 3 Mar 2011 15:13:57 +0100
Subject: [PATCH 1/2] nameif: fix parsing /proc/net/dev

The parser field lineno is initially zero and incremented upon each
call to config_read(). So lineno is effectively a "real" line number,
not an index. Fix the off-by-one bug here, which led to parsing for an
interface named "face".

Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
---
 networking/nameif.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/networking/nameif.c b/networking/nameif.c
index 6cf1c50..8e325e7 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -174,7 +174,7 @@ int nameif_main(int argc, char **argv)
 #if  ENABLE_FEATURE_NAMEIF_EXTENDED
 		struct ethtool_drvinfo drvinfo;
 #endif
-		if (parser->lineno < 2)
+		if (parser->lineno < 3)
 			continue; /* Skip the first two lines */
 
 		/* Find the current interface name and copy it to ifr.ifr_name */
-- 
1.7.3.4