linux-kernel - [PATCH] net: have ipconfig not wait if no dev is available

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1324371484-24082-1-git-send-email-gerlando.falauto@keymile.com>
Date:	Tue, 20 Dec 2011 09:58:04 +0100
From:	Gerlando Falauto <gerlando.falauto@...mile.com>
To:	unlisted-recipients:; (no To-header on input)
Cc:	Gerlando Falauto <gerlando.falauto@...mile.com>,
	Micha Nelissen <micha@...i.hopto.org>,
	Holger Brunck <holger.brunck@...mile.com>,
	"David S. Miller" <davem@...emloft.net> (maintainer:NETWORKING
	[IPv4/...),
	Alexey Kuznetsov <kuznet@....inr.ac.ru> (maintainer:NETWORKING
	[IPv4/...),
	"Pekka Savola (ipv6)" <pekkas@...core.fi> (maintainer:NETWORKING
	[IPv4/...),
	James Morris <jmorris@...ei.org> (maintainer:NETWORKING [IPv4/...),
	Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org> (maintainer:NETWORKING
	[IPv4/...),
	Patrick McHardy <kaber@...sh.net> (maintainer:NETWORKING [IPv4/...),
	netdev@...r.kernel.org (open list:NETWORKING [IPv4/...),
	linux-kernel@...r.kernel.org (open list)
Subject: [PATCH] net: have ipconfig not wait if no dev is available

previous commit 3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c
makes IP-Config wait for carrier on at least one network device.

Before waiting (predefined value 120s), check that at least one device
was successfully brought up. Otherwise (e.g. buggy bootloader
which does not set the MAC address) there is no point in waiting
for carrier.

Cc: Micha Nelissen <micha@...i.hopto.org>
Cc: Holger Brunck <holger.brunck@...mile.com>
Signed-off-by: Gerlando Falauto <gerlando.falauto@...mile.com>
---
 net/ipv4/ipconfig.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index ab7e554..7fbcaba 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -252,6 +252,10 @@ static int __init ic_open_devs(void)
 		}
 	}
 
+	/* no point in waiting if we could not bring up at least one device */
+	if (!ic_first_dev)
+		goto have_carrier;
+
 	/* wait for a carrier on at least one device */
 	start = jiffies;
 	while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) {
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/