From nobody@FreeBSD.org  Sun Mar 14 08:04:45 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45F131065688
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 14 Mar 2010 08:04:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C3E48FC27
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 14 Mar 2010 08:04:45 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2E84ihV094481
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 14 Mar 2010 08:04:44 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o2E84iIo094480;
	Sun, 14 Mar 2010 08:04:44 GMT
	(envelope-from nobody)
Message-Id: <201003140804.o2E84iIo094480@www.freebsd.org>
Date: Sun, 14 Mar 2010 08:04:44 GMT
From: "Earl R. Lapus" <earl.lapus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [ping6] lacks call to freeaddrinfo()
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         144730
>Category:       bin
>Synopsis:       [patch] ping6(8) lacks call to freeaddrinfo()
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brucec
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 14 08:10:02 UTC 2010
>Closed-Date:    Fri Jul 16 09:36:30 UTC 2010
>Last-Modified:  Fri Jul 16 09:36:30 UTC 2010
>Originator:     Earl R. Lapus
>Release:        FreeBSD 8.0
>Organization:
>Environment:
FreeBSD syutsyut.cebu.infoweapons.com 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Tue Dec 15 12:44:45 PHT 2009 root@syutsyut.cebu.infoweapons.com:/usr/obj/usr/src/sys/SYUTSYUT  i386
>Description:
One particular call to getaddrinfo() in ping6.c didn't have a freeaddrinfo() pair. All calls to getaddrinfo() should have an equivalent freeaddrinfo(), right?
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ../src/sbin/ping6/ping6.c ../src.mod/sbin/ping6/ping6.c
--- ../src/sbin/ping6/ping6.c	2009-10-25 09:10:29.000000000 +0800
+++ ../src.mod/sbin/ping6/ping6.c	2010-03-13 19:46:45.000000000 +0800
@@ -635,6 +635,8 @@
 	    res->ai_protocol)) < 0)
 		err(1, "socket");
 
+	freeaddrinfo(res);
+
 	/* set the source address if specified. */
 	if ((options & F_SRCADDR) &&
 	    bind(s, (struct sockaddr *)&src, srclen) != 0) {


>Release-Note:
>Audit-Trail:

From: Earl Lapus <earl.lapus@gmail.com>
To: bug-followup@FreeBSD.org, earl.lapus@gmail.com
Cc:  
Subject: Re: bin/144730: [patch] ping6(8) lacks call to freeaddrinfo()
Date: Tue, 23 Mar 2010 11:38:38 +0800

 Kindly disregard the patch I submitted. It's obviously wrong (see
 Hajimu UMEMOTO's comment in freebsd-net).

From: Earl Lapus <earl.lapus@gmail.com>
To: bug-followup@freebsd.org, earl.lapus@gmail.com
Cc:  
Subject: Re: bin/144730: [patch] ping6(8) lacks call to freeaddrinfo()
Date: Tue, 23 Mar 2010 18:05:06 +0800

 --0016e6469b60ad7f78048274f2bc
 Content-Type: text/plain; charset=ISO-8859-1
 
 Please see attached patch.
 
 --0016e6469b60ad7f78048274f2bc
 Content-Type: text/x-patch; charset=US-ASCII; name="ping6.c.diff"
 Content-Disposition: attachment; filename="ping6.c.diff"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_g74jnqbk0
 
 ZGlmZiAtcnVOIC4uL3NyYy9zYmluL3Bpbmc2L3Bpbmc2LmMgLi4vc3JjLm1vZC9zYmluL3Bpbmc2
 L3Bpbmc2LmMKLS0tIC4uL3NyYy9zYmluL3Bpbmc2L3Bpbmc2LmMJMjAwOS0xMC0yNSAwOToxMDoy
 OS4wMDAwMDAwMDAgKzA4MDAKKysrIC4uL3NyYy5tb2Qvc2Jpbi9waW5nNi9waW5nNi5jCTIwMTAt
 MDMtMjMgMTg6MDM6NTEuMDAwMDAwMDAwICswODAwCkBAIC0yMDksNyArMjA5LDcgQEAKIGludCBt
 eF9kdXBfY2sgPSBNQVhfRFVQX0NISzsKIGNoYXIgcmN2ZF90YmxbTUFYX0RVUF9DSEsgLyA4XTsK
 IAotc3RydWN0IGFkZHJpbmZvICpyZXM7CitzdHJ1Y3QgYWRkcmluZm8gKnJlcyA9IE5VTEw7CiBz
 dHJ1Y3Qgc29ja2FkZHJfaW42IGRzdDsJLyogd2hvIHRvIHBpbmc2ICovCiBzdHJ1Y3Qgc29ja2Fk
 ZHJfaW42IHNyYzsJLyogc3JjIGFkZHIgb2YgdGhpcyBwYWNrZXQgKi8KIHNvY2tsZW5fdCBzcmNs
 ZW47CkBAIC01MjUsNiArNTI1LDcgQEAKIAkJCW1lbWNweSgmc3JjLCByZXMtPmFpX2FkZHIsIHJl
 cy0+YWlfYWRkcmxlbik7CiAJCQlzcmNsZW4gPSByZXMtPmFpX2FkZHJsZW47CiAJCQlmcmVlYWRk
 cmluZm8ocmVzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlcyA9IE5VTEw7CiAJCQlvcHRp
 b25zIHw9IEZfU1JDQUREUjsKIAkJCWJyZWFrOwogCQljYXNlICdzJzoJCS8qIHNpemUgb2YgcGFj
 a2V0IHRvIHNlbmQgKi8KQEAgLTExOTEsNiArMTE5MiwxMCBAQAogCQl9CiAJfQogCXN1bW1hcnko
 KTsKKworICAgICAgICBpZihyZXMgIT0gTlVMTCkKKyAgICAgICAgICAgICAgICBmcmVlYWRkcmlu
 Zm8ocmVzKTsKKwogCWV4aXQobnJlY2VpdmVkID09IDAgPyAyIDogMCk7CiB9CiAKQEAgLTIyNDcs
 NiArMjI1Miw5IEBACiB7CiAJc3VtbWFyeSgpOwogCisgICAgICAgIGlmKHJlcyAhPSBOVUxMKQor
 ICAgICAgICAgICAgICAgIGZyZWVhZGRyaW5mbyhyZXMpOworCiAJKHZvaWQpc2lnbmFsKFNJR0lO
 VCwgU0lHX0RGTCk7CiAJKHZvaWQpa2lsbChnZXRwaWQoKSwgU0lHSU5UKTsKIAo=
 --0016e6469b60ad7f78048274f2bc--
Responsible-Changed-From-To: freebsd-bugs->brucec  
Responsible-Changed-By: brucec 
Responsible-Changed-When: Sun Apr 25 20:24:44 UTC 2010 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144730 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/144730: commit references a PR
Date: Wed, 16 Jun 2010 15:49:31 +0000 (UTC)

 Author: brucec
 Date: Wed Jun 16 15:49:17 2010
 New Revision: 209236
 URL: http://svn.freebsd.org/changeset/base/209236
 
 Log:
   Call free and freeaddrinfo before exiting.
   
   PR: bin/144730
   PR: bin/144974
   Submitted by: Earl R. Lapus <earl.lapus at gmail.com>
   Approved by: rrs (mentor)
   MFC after: 1 month
 
 Modified:
   head/sbin/ping6/ping6.c
 
 Modified: head/sbin/ping6/ping6.c
 ==============================================================================
 --- head/sbin/ping6/ping6.c	Wed Jun 16 15:40:13 2010	(r209235)
 +++ head/sbin/ping6/ping6.c	Wed Jun 16 15:49:17 2010	(r209236)
 @@ -210,7 +210,7 @@ u_int options;
  int mx_dup_ck = MAX_DUP_CHK;
  char rcvd_tbl[MAX_DUP_CHK / 8];
  
 -struct addrinfo *res;
 +struct addrinfo *res = NULL;
  struct sockaddr_in6 dst;	/* who to ping6 */
  struct sockaddr_in6 src;	/* src addr of this packet */
  socklen_t srclen;
 @@ -225,6 +225,13 @@ int ident;			/* process id to identify o
  u_int8_t nonce[8];		/* nonce field for node information */
  int hoplimit = -1;		/* hoplimit */
  int pathmtu = 0;		/* path MTU for the destination.  0 = unspec. */
 +u_char *packet = NULL;
 +#ifdef HAVE_POLL_H
 +struct pollfd fdmaskp[1];
 +#else
 +fd_set *fdmaskp = NULL;
 +int fdmasks;
 +#endif
  
  /* counters */
  long nmissedmax;		/* max value of ntransmitted - nreceived - 1 */
 @@ -302,19 +309,14 @@ main(argc, argv)
  	struct timeval timeout, *tv;
  #endif
  	struct addrinfo hints;
 -#ifdef HAVE_POLL_H
 -	struct pollfd fdmaskp[1];
 -#else
 -	fd_set *fdmaskp;
 -	int fdmasks;
 -#endif
  	int cc, i;
  	int ch, hold, packlen, preload, optval, ret_ga;
 -	u_char *datap, *packet;
 +	u_char *datap;
  	char *e, *target, *ifname = NULL, *gateway = NULL;
  	int ip6optlen = 0;
  	struct cmsghdr *scmsgp = NULL;
 -	struct cmsghdr *cm;
 +	/* For control (ancillary) data received from recvmsg() */
 +	struct cmsghdr cm[CONTROLLEN];
  #if defined(SO_SNDBUF) && defined(SO_RCVBUF)
  	u_long lsockbufsize;
  	int sockbufsize = 0;
 @@ -529,6 +531,7 @@ main(argc, argv)
  			memcpy(&src, res->ai_addr, res->ai_addrlen);
  			srclen = res->ai_addrlen;
  			freeaddrinfo(res);
 +			res = NULL;
  			options |= F_SRCADDR;
  			break;
  		case 's':		/* size of packet to send */
 @@ -1081,11 +1084,6 @@ main(argc, argv)
  	seeninfo = 0;
  #endif
  
 -	/* For control (ancillary) data received from recvmsg() */
 -	cm = (struct cmsghdr *)malloc(CONTROLLEN);
 -	if (cm == NULL)
 -		err(1, "malloc");
 -
  	for (;;) {
  		struct msghdr m;
  		struct iovec iov[2];
 @@ -1199,6 +1197,18 @@ main(argc, argv)
  		}
  	}
  	summary();
 +
 +	if (res != NULL)
 +		freeaddrinfo(res);
 +
 +        if(packet != NULL)
 +                free(packet);
 +
 +#ifndef HAVE_POLL_H
 +        if(fdmaskp != NULL)
 +                free(fdmaskp);
 +#endif
 +
  	exit(nreceived == 0 ? 2 : 0);
  }
  
 @@ -2255,6 +2265,17 @@ onint(notused)
  {
  	summary();
  
 +	if (res != NULL)
 +		freeaddrinfo(res);
 +
 +        if(packet != NULL)
 +                free(packet);
 +
 +#ifndef HAVE_POLL_H
 +        if(fdmaskp != NULL)
 +                free(fdmaskp);
 +#endif
 +
  	(void)signal(SIGINT, SIG_DFL);
  	(void)kill(getpid(), SIGINT);
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched  
State-Changed-By: brucec 
State-Changed-When: Wed Jun 16 15:53:01 UTC 2010 
State-Changed-Why:  
Fixed in HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144730 
State-Changed-From-To: patched->closed  
State-Changed-By: brucec 
State-Changed-When: Fri Jul 16 09:36:02 UTC 2010 
State-Changed-Why:  
Not to be MFC'd. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144730 
>Unformatted:
