From nobody@FreeBSD.org  Wed Jun 20 14:18:56 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2F52916A51F
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jun 2007 14:18:56 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C35213C4AE
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jun 2007 14:18:56 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l5KEItLl019104
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 20 Jun 2007 14:18:56 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l5KEItrB019102;
	Wed, 20 Jun 2007 14:18:55 GMT
	(envelope-from nobody)
Message-Id: <200706201418.l5KEItrB019102@www.freebsd.org>
Date: Wed, 20 Jun 2007 14:18:55 GMT
From: Alexander Drozdov <dzal_mail@mtu-net.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [sysctl] Wrong memory usage
X-Send-Pr-Version: www-3.0

>Number:         113881
>Category:       bin
>Synopsis:       [patch] sysctl(8): Wrong memory usage
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    brucec
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 20 14:20:21 GMT 2007
>Closed-Date:    Tue Apr 20 20:27:03 UTC 2010
>Last-Modified:  Tue Apr 20 20:30:06 UTC 2010
>Originator:     Alexander Drozdov
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
Inline Telecom Solutions
>Environment:
FreeBSD sorcerer.bm.in-line.local 6.2-RELEASE FreeBSD 6.2-RELEASE #4: Mon Jan 15 16:56:39 MSK 2007     sorcerer@sorcerer.bm.in-line.local:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
There are bugs in /usr/src/sbin/sysctl/sysctl.c

1. In S_timeval():
   It is needed to free() strdup()-ed string;
2. On sysctl_all():
   I'm not sure but I think that name1 array length should be greater than name2 one on 2 because of copying data via memcpy() at the bottom of the function;
3. In show_var():
   Printing freed data.
>How-To-Repeat:
Via valgrind, running

sysctl -a
>Fix:
A patch.

Patch attached with submission follows:

--- sysctl.c.orig	Wed Jun 20 17:49:09 2007
+++ sysctl.c	Wed Jun 20 17:58:27 2007
@@ -372,6 +372,7 @@
 		if (*p2 == '\n')
 			*p2 = '\0';
 	fputs(p1, stdout);
+	free(p1);
 	return (0);
 }
 
@@ -684,10 +685,13 @@
 		else
 			func = NULL;
 		if (func) {
+			int rc;
+
 			if (!nflag)
 				printf("%s%s", name, sep);
+			rc = (*func)(len, p);
 			free(oval);
-			return ((*func)(len, p));
+			return (rc);
 		}
 		/* FALLTHROUGH */
 	default:
@@ -712,7 +716,7 @@
 static int
 sysctl_all (int *oid, int len)
 {
-	int name1[22], name2[22];
+	int name1[24], name2[22];
 	int i, j;
 	size_t l1, l2;
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->brucec  
Responsible-Changed-By: brucec 
Responsible-Changed-When: Sun Feb 28 14:31:08 UTC 2010 
Responsible-Changed-Why:  
Take. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/113881: commit references a PR
Date: Sat, 13 Mar 2010 11:09:06 +0000 (UTC)

 Author: brucec
 Date: Sat Mar 13 11:08:57 2010
 New Revision: 205118
 URL: http://svn.freebsd.org/changeset/base/205118
 
 Log:
   Free the memory allocated via strdup.
   
   PR:		bin/113881
   Submitted by:	Alexander Drozdov  dzal_mail mtu-net.ru
   Approved by:	rrs (mentor)
   MFC after:	1 week
 
 Modified:
   head/sbin/sysctl/sysctl.c
 
 Modified: head/sbin/sysctl/sysctl.c
 ==============================================================================
 --- head/sbin/sysctl/sysctl.c	Sat Mar 13 11:06:47 2010	(r205117)
 +++ head/sbin/sysctl/sysctl.c	Sat Mar 13 11:08:57 2010	(r205118)
 @@ -382,6 +382,7 @@ S_timeval(int l2, void *p)
  		if (*p2 == '\n')
  			*p2 = '\0';
  	fputs(p1, stdout);
 +	free(p1);
  	return (0);
  }
  
 _______________________________________________
 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: Sat Mar 13 11:22:02 UTC 2010 
State-Changed-Why:  
Fixed in HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113881 
State-Changed-From-To: patched->closed 
State-Changed-By: brucec 
State-Changed-When: Tue Apr 20 20:26:45 UTC 2010 
State-Changed-Why:  
Fix has been committed to stable/7 and stable/8. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/113881: commit references a PR
Date: Tue, 20 Apr 2010 20:24:15 +0000 (UTC)

 Author: brucec
 Date: Tue Apr 20 20:24:00 2010
 New Revision: 206913
 URL: http://svn.freebsd.org/changeset/base/206913
 
 Log:
   MFC r205118:
   
   Free the memory allocated via strdup.
   
   PR:	bin/113881
   Submitted by:	Alexander Drozdov (dzal_mail at mtu-net.ru)
   Approved by:	rrs (mentor)
 
 Modified:
   stable/8/sbin/sysctl/sysctl.c
 Directory Properties:
   stable/8/sbin/sysctl/   (props changed)
 
 Modified: stable/8/sbin/sysctl/sysctl.c
 ==============================================================================
 --- stable/8/sbin/sysctl/sysctl.c	Tue Apr 20 20:21:01 2010	(r206912)
 +++ stable/8/sbin/sysctl/sysctl.c	Tue Apr 20 20:24:00 2010	(r206913)
 @@ -379,6 +379,7 @@ S_timeval(int l2, void *p)
  		if (*p2 == '\n')
  			*p2 = '\0';
  	fputs(p1, stdout);
 +	free(p1);
  	return (0);
  }
  
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/113881: commit references a PR
Date: Tue, 20 Apr 2010 20:26:45 +0000 (UTC)

 Author: brucec
 Date: Tue Apr 20 20:26:26 2010
 New Revision: 206914
 URL: http://svn.freebsd.org/changeset/base/206914
 
 Log:
   MFC r205118:
   
   Free the memory allocated via strdup.
   
   PR:	bin/113881
   Submitted by:	Alexander Drozdov <dzal_mail at mtu-net.ru>
   Approved by:	rrs (mentor)
 
 Modified:
   stable/7/sbin/sysctl/sysctl.c
 Directory Properties:
   stable/7/sbin/sysctl/   (props changed)
 
 Modified: stable/7/sbin/sysctl/sysctl.c
 ==============================================================================
 --- stable/7/sbin/sysctl/sysctl.c	Tue Apr 20 20:24:00 2010	(r206913)
 +++ stable/7/sbin/sysctl/sysctl.c	Tue Apr 20 20:26:26 2010	(r206914)
 @@ -371,6 +371,7 @@ S_timeval(int l2, void *p)
  		if (*p2 == '\n')
  			*p2 = '\0';
  	fputs(p1, stdout);
 +	free(p1);
  	return (0);
  }
  
 _______________________________________________
 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"
 
>Unformatted:
