From 611719282d891dd752e184671f74279db2fbfbb2 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 16 May 2012 08:37:08 +0200 Subject: [PATCH] dns: fix recursive loop resolv() uses getenv_ip() which in turn calls resolv(). Fix this inifinite loop by not using getenv_ip directly. Signed-off-by: Sascha Hauer --- net/dns.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/dns.c b/net/dns.c index e13d65421..eb96c5760 100644 --- a/net/dns.c +++ b/net/dns.c @@ -197,6 +197,7 @@ static void dns_handler(void *ctx, char *packet, unsigned len) IPaddr_t resolv(char *host) { IPaddr_t ip; + const char *ns; if (!string_to_ip(host, &ip)) return ip; @@ -205,8 +206,14 @@ IPaddr_t resolv(char *host) dns_state = STATE_INIT; - ip = getenv_ip("net.nameserver"); - if (!ip) + ns = getenv("net.nameserver"); + if (!ns || !*ns) { + printk("%s: no nameserver specified in $net.nameserver\n", + __func__); + return 0; + } + + if (string_to_ip(ns, &ip)) return 0; debug("resolving host %s via nameserver %s\n", host, ip_to_string(ip));