From nobody@FreeBSD.org  Mon Mar  7 14:32:42 2011
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 71A20106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  7 Mar 2011 14:32:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 60C858FC25
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  7 Mar 2011 14:32:42 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p27EWfl9081757
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 7 Mar 2011 14:32:41 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p27EWfvp081753;
	Mon, 7 Mar 2011 14:32:41 GMT
	(envelope-from nobody)
Message-Id: <201103071432.p27EWfvp081753@red.freebsd.org>
Date: Mon, 7 Mar 2011 14:32:41 GMT
From: Urankar Mikael <mikael.urankar@ujf-grenoble.fr>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] kbdmap segfault when rc.conf is non existent
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         155349
>Category:       bin
>Synopsis:       [patch] kbdmap(1) segfault when rc.conf is non existent
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 07 14:40:07 UTC 2011
>Closed-Date:    Thu Aug 11 15:37:43 UTC 2011
>Last-Modified:  Thu Aug 11 15:37:43 UTC 2011
>Originator:     Urankar Mikael
>Release:        
>Organization:
>Environment:
FreeBSD iut-mir-o.ujf-grenoble.fr 9.0-CURRENT FreeBSD 9.0-CURRENT #39 r219368M: Mon Mar  7 12:15:50 CET 2011     murankar@iut-mir-o.ujf-grenoble.fr:/usr/obj/usr/src/sys/LETHE  amd64
>Description:
kbdmap segfault when rc.conf is non existent

Here is the backtrace :

Starting program: /usr/obj/usr/src/usr.sbin/kbdmap/kbdmap
kbdcontrol: getting keymap: Inappropriate ioctl for device
You are not on a virtual console - expect certain strange side-effects
Could not open /etc/rc.conf for reading

Program received signal SIGSEGV, Segmentation fault.
0x00000008009214e7 in fclose () from /lib/libc.so.7
(gdb) bt full
#0  0x00000008009214e7 in fclose () from /lib/libc.so.7
No symbol table info available.
#1  0x000000000040249c in main (argc=1, argv=0x7fffffffd9a8) at /usr/src/usr.sbin/kbdmap/kbdmap.c:232
No locals.

>How-To-Repeat:
Delete /etc/rc.conf and run kbdmap
>Fix:
Close the file stream only if it was successfully opened.

Patch attached with submission follows:

Index: kbdmap.c
===================================================================
--- kbdmap.c	(révision 219368)
+++ kbdmap.c	(copie de travail)
@@ -226,10 +226,10 @@
 				}
 			}
 		}
+		fclose(fp);
 	} else
 		fprintf(stderr, "Could not open %s for reading\n", sysconfig);
 
-	fclose(fp);
 	return fnt;
 }
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->jh 
Responsible-Changed-By: jh 
Responsible-Changed-When: Thu May 26 16:07:28 UTC 2011 
Responsible-Changed-Why:  
Take. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/155349: commit references a PR
Date: Wed,  1 Jun 2011 15:48:59 +0000 (UTC)

 Author: jh
 Date: Wed Jun  1 15:48:43 2011
 New Revision: 222568
 URL: http://svn.freebsd.org/changeset/base/222568
 
 Log:
   Don't try to close the stream if fopen(3) fails.
   
   PR:		bin/155349
   Submitted by:	Urankar Mikael
 
 Modified:
   head/usr.sbin/kbdmap/kbdmap.c
 
 Modified: head/usr.sbin/kbdmap/kbdmap.c
 ==============================================================================
 --- head/usr.sbin/kbdmap/kbdmap.c	Wed Jun  1 15:46:26 2011	(r222567)
 +++ head/usr.sbin/kbdmap/kbdmap.c	Wed Jun  1 15:48:43 2011	(r222568)
 @@ -226,10 +226,10 @@ get_font(void)
  				}
  			}
  		}
 +		fclose(fp);
  	} else
  		fprintf(stderr, "Could not open %s for reading\n", sysconfig);
  
 -	fclose(fp);
  	return fnt;
  }
  
 _______________________________________________
 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: jh 
State-Changed-When: Wed Jun 1 15:58:55 UTC 2011 
State-Changed-Why:  
Patched in head (r222568). Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/155349: commit references a PR
Date: Sat, 30 Jul 2011 08:31:39 +0000 (UTC)

 Author: jh
 Date: Sat Jul 30 08:31:18 2011
 New Revision: 224507
 URL: http://svn.freebsd.org/changeset/base/224507
 
 Log:
   MFC r216047 by kevlo:
   
   Fix fd leak in get_font
   
   MFC r222568:
   
   Don't try to close the stream if fopen(3) fails.
   
   PR:		bin/155349
 
 Modified:
   stable/8/usr.sbin/kbdmap/kbdmap.c
 Directory Properties:
   stable/8/usr.sbin/kbdmap/   (props changed)
 
 Modified: stable/8/usr.sbin/kbdmap/kbdmap.c
 ==============================================================================
 --- stable/8/usr.sbin/kbdmap/kbdmap.c	Sat Jul 30 01:06:12 2011	(r224506)
 +++ stable/8/usr.sbin/kbdmap/kbdmap.c	Sat Jul 30 08:31:18 2011	(r224507)
 @@ -226,6 +226,7 @@ get_font(void)
  				}
  			}
  		}
 +		fclose(fp);
  	} else
  		fprintf(stderr, "Could not open %s for reading\n", sysconfig);
  
 _______________________________________________
 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/155349: commit references a PR
Date: Thu, 11 Aug 2011 15:22:57 +0000 (UTC)

 Author: jh
 Date: Thu Aug 11 15:22:46 2011
 New Revision: 224783
 URL: http://svn.freebsd.org/changeset/base/224783
 
 Log:
   MFC r216047 by kevlo:
   
   Fix fd leak in get_font
   
   MFC r222568:
   
   Don't try to close the stream if fopen(3) fails.
   
   PR:		bin/155349
 
 Modified:
   stable/7/usr.sbin/kbdmap/kbdmap.c
 Directory Properties:
   stable/7/usr.sbin/kbdmap/   (props changed)
 
 Modified: stable/7/usr.sbin/kbdmap/kbdmap.c
 ==============================================================================
 --- stable/7/usr.sbin/kbdmap/kbdmap.c	Thu Aug 11 14:17:04 2011	(r224782)
 +++ stable/7/usr.sbin/kbdmap/kbdmap.c	Thu Aug 11 15:22:46 2011	(r224783)
 @@ -226,6 +226,7 @@ get_font(void)
  				}
  			}
  		}
 +		fclose(fp);
  	} else
  		fprintf(stderr, "Could not open %s for reading\n", sysconfig);
  
 _______________________________________________
 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: patched->closed 
State-Changed-By: jh 
State-Changed-When: Thu Aug 11 15:37:42 UTC 2011 
State-Changed-Why:  
Fixed. Thanks! 

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