From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aUeUE-0006vg-Hr for mharc-grub-devel@gnu.org; Sat, 13 Feb 2016 13:00:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUeUC-0006sE-60 for grub-devel@gnu.org; Sat, 13 Feb 2016 13:00:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUeU8-0007do-5w for grub-devel@gnu.org; Sat, 13 Feb 2016 13:00:00 -0500 Received: from mail-lb0-x242.google.com ([2a00:1450:4010:c04::242]:36574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUeU7-0007dW-SZ for grub-devel@gnu.org; Sat, 13 Feb 2016 12:59:56 -0500 Received: by mail-lb0-x242.google.com with SMTP id zr1so4833412lbb.3 for ; Sat, 13 Feb 2016 09:59:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=GGhYns5szF8AZ81vRuZhQLhlr3LLGEfNJqbyo3t8pJ4=; b=bwraHZsgewGfKe+duRAXYngxi4Xyr/+eP2ndZKb8QscihfdYI6+hbUZbLTH4mjIsMc r9TqhP7eNYu8TgNVPe4DFTvjF0YTU/zT2Ul0lv/PofrpoqD5Scx2I2Sr36htEv28aEZd XfJ7LGfwk5CnVu/F0Vt4c5qAq0UOKIucsmcuzuxjUE45BjcjPLYp1zgbsqCRj1qa18tl 17OahUmGp362eOZAhZDZgagsinEe0cUtRzetiDSKxonuhmLt/n+pOOHbQpPUOIbz3lGD 65XxQmmkZ/KgKP/fIqjpGtATJky7BrJQRSx6xMHB3xdpCx9omka9i8vs7t47epJHa6JX c3qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=GGhYns5szF8AZ81vRuZhQLhlr3LLGEfNJqbyo3t8pJ4=; b=V5Og1jT6GCo8xrXfwHJRo/+zdF6OqXYzqfKGT48wBwkn6c4XSDMd4+8h5A9GIEMFQa T2FGo4b4Jr49TAhxkwCjI/yp0Zd4fwoKkfZToW3Ou3S+tnIKvVI0X2cSo4hSldq6uIlN kaxG0hDJY8gngT4kYJz8lOBwMBkeaAf69pXLtfzcGG//8q/nA46ZQUdr2oa2pYnrUKha vZPE/wFM2TM2Ea5NZD0M/vAMtOorcXddDhKbi5g85a6SDMANFbF81QZX9KRsZ6Vwumnb 60uqqtQ8cIKoLMOnjzNxf2X7h9pFAfJuTth7Ezs6Tz0f4UGkgkjy2X7Dcr3Uq69M0/kJ a0+w== X-Gm-Message-State: AG10YOTZya8H2I6AhMgtYaH7IOhGhlvZQ/YcTJnDqv/iYUqo0yhQWbx3oiY4cmFD+w6mlA== X-Received: by 10.112.126.72 with SMTP id mw8mr3400786lbb.14.1455386394951; Sat, 13 Feb 2016 09:59:54 -0800 (PST) Received: from [192.168.1.41] (ppp109-252-76-159.pppoe.spdop.ru. [109.252.76.159]) by smtp.gmail.com with ESMTPSA id v140sm2633736lfd.24.2016.02.13.09.59.53 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 13 Feb 2016 09:59:54 -0800 (PST) Subject: Re: [PATCH 05/14] net: don't free uninitialized sockets in dns To: The development of GNU GRUB , kernel-team@fb.com References: <1455139268-3241273-1-git-send-email-jbacik@fb.com> <1455139268-3241273-6-git-send-email-jbacik@fb.com> From: Andrei Borzenkov Message-ID: <56BF6F19.8030609@gmail.com> Date: Sat, 13 Feb 2016 20:59:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1455139268-3241273-6-git-send-email-jbacik@fb.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::242 Cc: Josef Bacik X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2016 18:00:01 -0000 11.02.2016 00:20, Josef Bacik пишет: > If we cannot open a connection to our dns server we will have NULL sockets in > our array, so don't do the cleanup on any sockets that didn't get created. > Was not it already fixed by commit a01ab69848257a3df705e524c4acafe795e05cc9 Author: Andrei Borzenkov Date: Mon Oct 12 23:16:23 2015 +0300 net: avoid closing NULL socket in DNS lookup Refactor code so that we do not store NULL pointers in array of in-flight DNS servers. Reported-By: Josef Bacik > Signed-off-by: Josef Bacik > --- > grub-core/net/dns.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c > index 89741dd..82a3307 100644 > --- a/grub-core/net/dns.c > +++ b/grub-core/net/dns.c > @@ -598,7 +598,10 @@ grub_net_dns_lookup (const char *name, > grub_free (data.name); > grub_netbuff_free (nb); > for (j = 0; j < send_servers; j++) > - grub_net_udp_close (sockets[j]); > + { > + if (sockets[j]) > + grub_net_udp_close (sockets[j]); > + } > > grub_free (sockets); > >