From owner-freebsd-audit Mon Sep 30 0:20:49 2002 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F417637B401; Mon, 30 Sep 2002 00:20:43 -0700 (PDT) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id 217D343E6E; Mon, 30 Sep 2002 00:20:43 -0700 (PDT) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.12.6/8.12.6) with ESMTP id g8U7KN0U059915; Mon, 30 Sep 2002 09:20:23 +0200 (CEST) (envelope-from phk@critter.freebsd.dk) To: audit@freebsd.org, current@freebsd.org Subject: PATCH: various memory leaks. From: Poul-Henning Kamp Date: Mon, 30 Sep 2002 09:20:23 +0200 Message-ID: <59914.1033370423@critter.freebsd.dk> Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I went through the FlexeLint output of the LINT kernel on i386 and tried to examine all warnings about memoryleaks in central or semi-central code. I this patch I belive addresses the ones I think I could confirm, in the following files: cam/scsi/scsi_cd.c cam/scsi/scsi_da.c dev/ata/ata-all.c fs/pseudofs/pseudofs_vncache.c fs/umapfs/umap_vfsops.c kern/kern_ktrace.c kern/kern_linker.c ufs/ufs/ufs_vnops.c I would appreciate if the respective owners, authors, maintainers etc would review and commit their own bits from this patch. Thanks in advance! Poul-Henning Index: cam/scsi/scsi_cd.c =================================================================== RCS file: /home/ncvs/src/sys/cam/scsi/scsi_cd.c,v retrieving revision 1.61 diff -u -r1.61 scsi_cd.c --- cam/scsi/scsi_cd.c 28 Sep 2002 17:14:05 -0000 1.61 +++ cam/scsi/scsi_cd.c 30 Sep 2002 06:11:54 -0000 @@ -1463,6 +1463,7 @@ start_ccb->ccb_h.ccb_bp = NULL; start_ccb->ccb_h.ccb_state = CD_CCB_PROBE; xpt_action(start_ccb); + /* XXX missing free(rcap, M_TEMP) ??? */ break; } } Index: cam/scsi/scsi_da.c =================================================================== RCS file: /home/ncvs/src/sys/cam/scsi/scsi_da.c,v retrieving revision 1.108 diff -u -r1.108 scsi_da.c --- cam/scsi/scsi_da.c 20 Sep 2002 19:35:52 -0000 1.108 +++ cam/scsi/scsi_da.c 30 Sep 2002 06:13:35 -0000 @@ -1249,6 +1249,7 @@ start_ccb->ccb_h.ccb_bp = NULL; start_ccb->ccb_h.ccb_state = DA_CCB_PROBE; xpt_action(start_ccb); + /* XXX missing free(rcap, M_TEMP) ?? */ break; } } Index: dev/ata/ata-all.c =================================================================== RCS file: /home/ncvs/src/sys/dev/ata/ata-all.c,v retrieving revision 1.154 diff -u -r1.154 ata-all.c --- dev/ata/ata-all.c 12 Sep 2002 14:32:33 -0000 1.154 +++ dev/ata/ata-all.c 30 Sep 2002 06:19:11 -0000 @@ -454,8 +454,10 @@ if (iocmd->u.atapi.flags & ATAPI_CMD_WRITE) { error = copyin(iocmd->u.atapi.data, buf, iocmd->u.atapi.count); - if (error) + if (error) { + free(buf, M_ATA); return error; + } } error = atapi_queue_cmd(atadev, iocmd->u.atapi.ccb, buf, iocmd->u.atapi.count, Index: fs/pseudofs/pseudofs_vncache.c =================================================================== RCS file: /home/ncvs/src/sys/fs/pseudofs/pseudofs_vncache.c,v retrieving revision 1.17 diff -u -r1.17 pseudofs_vncache.c --- fs/pseudofs/pseudofs_vncache.c 14 Sep 2002 09:02:24 -0000 1.17 +++ fs/pseudofs/pseudofs_vncache.c 30 Sep 2002 06:23:59 -0000 @@ -136,8 +136,10 @@ if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; error = getnewvnode("pseudofs", mp, pfs_vnodeop_p, vpp); - if (error) + if (error) { + FREE(pvd, M_PFSVNCACHE); return (error); + } pvd->pvd_pn = pn; pvd->pvd_pid = pid; (*vpp)->v_data = pvd; Index: fs/umapfs/umap_vfsops.c =================================================================== RCS file: /home/ncvs/src/sys/fs/umapfs/umap_vfsops.c,v retrieving revision 1.46 diff -u -r1.46 umap_vfsops.c --- fs/umapfs/umap_vfsops.c 4 Aug 2002 10:29:31 -0000 1.46 +++ fs/umapfs/umap_vfsops.c 30 Sep 2002 06:26:18 -0000 @@ -170,6 +170,8 @@ if (args.nentries > MAPFILEENTRIES || args.gnentries > GMAPFILEENTRIES) { vput(lowerrootvp); + free(amp, M_UMAPFSMNT); + /* XXX missing error = EINVAL ? */ return (error); } @@ -177,8 +179,10 @@ amp->info_gnentries = args.gnentries; error = copyin(args.mapdata, (caddr_t)amp->info_mapdata, 2*sizeof(u_long)*args.nentries); - if (error) + if (error) { + free(amp, M_UMAPFSMNT); return (error); + } #ifdef DEBUG printf("umap_mount:nentries %d\n",args.nentries); @@ -189,8 +193,10 @@ error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata, 2*sizeof(u_long)*args.gnentries); - if (error) + if (error) { + free(amp, M_UMAPFSMNT); return (error); + } #ifdef DEBUG printf("umap_mount:gnentries %d\n",args.gnentries); Index: kern/kern_ktrace.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_ktrace.c,v retrieving revision 1.77 diff -u -r1.77 kern_ktrace.c --- kern/kern_ktrace.c 11 Sep 2002 21:00:56 -0000 1.77 +++ kern/kern_ktrace.c 30 Sep 2002 06:35:00 -0000 @@ -325,8 +325,11 @@ bcopy(args, buf, buflen); } req = ktr_getrequest(KTR_SYSCALL); - if (req == NULL) + if (req == NULL) { + if (buf != NULL) + free(buf, M_KTRACE); return; + } ktp = &req->ktr_data.ktr_syscall; ktp->ktr_code = code; ktp->ktr_narg = narg; @@ -372,8 +375,11 @@ bcopy(path, buf, namelen); } req = ktr_getrequest(KTR_NAMEI); - if (req == NULL) + if (req == NULL) { + if (buf != NULL) + free(buf, M_KTRACE); return; + } if (namelen > 0) { req->ktr_header.ktr_len = namelen; req->ktr_header.ktr_buffer = buf; @@ -621,11 +627,15 @@ return (EINVAL); cp = malloc(uap->len, M_KTRACE, M_WAITOK); error = copyin(uap->addr, cp, uap->len); - if (error) + if (error) { + free(cp, M_KTRACE); return (error); + } req = ktr_getrequest(KTR_USER); - if (req == NULL) + if (req == NULL) { + free(cp, M_KTRACE); return (0); + } req->ktr_header.ktr_buffer = cp; req->ktr_header.ktr_len = uap->len; ktr_submitrequest(req); Index: kern/kern_linker.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_linker.c,v retrieving revision 1.94 diff -u -r1.94 kern_linker.c --- kern/kern_linker.c 15 Aug 2002 20:55:03 -0000 1.94 +++ kern/kern_linker.c 30 Sep 2002 06:36:15 -0000 @@ -1531,6 +1531,7 @@ printf("warning: KLD '%s' is newer than the linker.hints" " file\n", result); bad: + free(pathbuf, M_LINKER); if (hints) free(hints, M_TEMP); if (nd.ni_vp != NULL) { Index: ufs/ufs/ufs_vnops.c =================================================================== RCS file: /home/ncvs/src/sys/ufs/ufs/ufs_vnops.c,v retrieving revision 1.210 diff -u -r1.210 ufs_vnops.c --- ufs/ufs/ufs_vnops.c 28 Sep 2002 17:15:31 -0000 1.210 +++ ufs/ufs/ufs_vnops.c 30 Sep 2002 07:06:33 -0000 @@ -1480,6 +1480,8 @@ default: UFS_VFREE(tvp, ip->i_number, dmode); vput(tvp); + FREE(acl, M_ACL); + FREE(dacl, M_ACL); return (error); } #else /* !UFS_ACL */ @@ -2381,6 +2383,8 @@ default: UFS_VFREE(tvp, ip->i_number, mode); vput(tvp); + FREE(acl, M_ACL); + acl = NULL; return (error); } #else /* !UFS_ACL */ -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message From owner-freebsd-audit Mon Sep 30 11: 1: 2 2002 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 535A437B407 for ; Mon, 30 Sep 2002 11:01:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F204543E7B for ; Mon, 30 Sep 2002 11:01:00 -0700 (PDT) (envelope-from owner-bugmaster@freebsd.org) Received: from freefall.freebsd.org (peter@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8UI10Co044884 for ; Mon, 30 Sep 2002 11:01:00 -0700 (PDT) (envelope-from owner-bugmaster@freebsd.org) Received: (from peter@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8UI0xCb044860 for audit@freebsd.org; Mon, 30 Sep 2002 11:00:59 -0700 (PDT) Date: Mon, 30 Sep 2002 11:00:59 -0700 (PDT) Message-Id: <200209301800.g8UI0xCb044860@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: peter set sender to owner-bugmaster@freebsd.org using -f From: FreeBSD bugmaster To: audit@FreeBSD.org Subject: Current problem reports assigned to you Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Current FreeBSD problem reports Critical problems Serious problems Non-critical problems S Submitted Tracker Resp. Description ------------------------------------------------------------------------------- a [1999/01/28] bin/9770 audit An openpty(3) auxiliary program 1 problem total. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message From owner-freebsd-audit Mon Sep 30 11:28:56 2002 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6950837B401; Mon, 30 Sep 2002 11:28:55 -0700 (PDT) Received: from smtp.hccnet.nl (smtp.hccnet.nl [62.251.0.13]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25C4D43E6E; Mon, 30 Sep 2002 11:28:54 -0700 (PDT) (envelope-from znerd@FreeBSD.org) Received: from heinz by smtp.hccnet.nl via uds241-44.dial.hccnet.nl [62.251.44.241] with ESMTP id UAA28870 (8.8.8/1.13); Mon, 30 Sep 2002 20:24:53 +0200 (MET DST) Content-Type: text/plain; charset="iso-8859-1" From: Ernst de Haan Organization: FreeBSD Project To: Bill Huey (Hui) Subject: Re: daemonctl.c: setuid/setgid Date: Mon, 30 Sep 2002 20:24:53 +0200 User-Agent: KMail/1.4.3 Cc: audit@FreeBSD.org, Ari Suutari , Kris Kennaway , java@FreeBSD.org References: <200209132001.WAA09258@smtp.hccnet.nl> <20020913232816.GA1933@gnuppy.monkey.org> In-Reply-To: <20020913232816.GA1933@gnuppy.monkey.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-Id: <200209302024.53410.znerd@FreeBSD.org> Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Saturday 14 September 2002 01:28, Bill Huey (Hui) wrote: > On Fri, Sep 13, 2002 at 10:01:48PM +0200, Ernst de Haan wrote: > > Dear audit :) > > > > Hereby I request a review of a patch for a daemon control program. > > > > The file in question is: ports/www/jakarta-tomcat4/files/daemonctl.c > > I was just looking at it last night and the first thing that came to > mind was the hard coded JVM path. I'd like that turned into a macro or > something that's command line specifiable at startup. Yes, that's a good idea and it has already been implemented by Ari. But it has nothing to do with the patch self. I now assume there are no objections to this patch. I intend to commit it when the ports freeze is over. -- Ernst To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message From owner-freebsd-audit Mon Sep 30 11:39:40 2002 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B33337B404 for ; Mon, 30 Sep 2002 11:39:38 -0700 (PDT) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id BC9B443E6E for ; Mon, 30 Sep 2002 11:39:32 -0700 (PDT) (envelope-from nate@rootlabs.com) Received: (qmail 82751 invoked by uid 1000); 30 Sep 2002 18:39:33 -0000 Date: Mon, 30 Sep 2002 11:39:33 -0700 (PDT) From: Nate Lawson To: Poul-Henning Kamp Cc: audit@freebsd.org, current@freebsd.org Subject: Re: PATCH: various memory leaks. In-Reply-To: <59914.1033370423@critter.freebsd.dk> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 30 Sep 2002, Poul-Henning Kamp wrote: > > I went through the FlexeLint output of the LINT kernel on i386 and > tried to examine all warnings about memoryleaks in central or > semi-central code. > > I this patch I belive addresses the ones I think I could confirm, > in the following files: > cam/scsi/scsi_cd.c > cam/scsi/scsi_da.c > dev/ata/ata-all.c > fs/pseudofs/pseudofs_vncache.c > fs/umapfs/umap_vfsops.c > kern/kern_ktrace.c > kern/kern_linker.c > ufs/ufs/ufs_vnops.c > > I would appreciate if the respective owners, authors, maintainers > etc would review and commit their own bits from this patch. > > Thanks in advance! > > Poul-Henning > > > Index: cam/scsi/scsi_cd.c > =================================================================== > RCS file: /home/ncvs/src/sys/cam/scsi/scsi_cd.c,v > retrieving revision 1.61 > diff -u -r1.61 scsi_cd.c > --- cam/scsi/scsi_cd.c 28 Sep 2002 17:14:05 -0000 1.61 > +++ cam/scsi/scsi_cd.c 30 Sep 2002 06:11:54 -0000 > @@ -1463,6 +1463,7 @@ > start_ccb->ccb_h.ccb_bp = NULL; > start_ccb->ccb_h.ccb_state = CD_CCB_PROBE; > xpt_action(start_ccb); > + /* XXX missing free(rcap, M_TEMP) ??? */ > break; > } > } > Index: cam/scsi/scsi_da.c > =================================================================== > RCS file: /home/ncvs/src/sys/cam/scsi/scsi_da.c,v > retrieving revision 1.108 > diff -u -r1.108 scsi_da.c > --- cam/scsi/scsi_da.c 20 Sep 2002 19:35:52 -0000 1.108 > +++ cam/scsi/scsi_da.c 30 Sep 2002 06:13:35 -0000 > @@ -1249,6 +1249,7 @@ > start_ccb->ccb_h.ccb_bp = NULL; > start_ccb->ccb_h.ccb_state = DA_CCB_PROBE; > xpt_action(start_ccb); > + /* XXX missing free(rcap, M_TEMP) ?? */ > break; > } > } Thanks for working on cleaning things up. The SCSI ones are wrong. The rcap is attached to csio->data_ptr and is unconditionally freed in the completion routine, cddone() (see the CD_CCB_PROBE case there). -Nate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message From owner-freebsd-audit Wed Oct 2 19:45:27 2002 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8704A37B401 for ; Wed, 2 Oct 2002 19:45:26 -0700 (PDT) Received: from sources.redhat.com (sources.redhat.com [209.249.29.67]) by mx1.FreeBSD.org (Postfix) with SMTP id 8293443E7B for ; Wed, 2 Oct 2002 19:45:25 -0700 (PDT) (envelope-from anonymous@sources.redhat.com) Received: (qmail 804 invoked by uid 61); 3 Oct 2002 02:45:09 -0000 Date: 3 Oct 2002 02:45:09 -0000 Message-ID: <20021003024509.802.qmail@sources.redhat.com> To: audit@freebsd.org, current@freebsd.org, gcc-bugs@gcc.gnu.org, gcc-prs@gcc.gnu.org, jhb@FreeBSD.org, nobody@gcc.gnu.org, obrien@FreeBSD.org From: sayle@gcc.gnu.org Reply-To: sayle@gcc.gnu.org, audit@freebsd.org, current@freebsd.org, gcc-bugs@gcc.gnu.org, gcc-prs@gcc.gnu.org, jhb@FreeBSD.org, nobody@gcc.gnu.org, obrien@FreeBSD.org, gcc-gnats@gcc.gnu.org X-Mailer: gnatsweb 2.9.3 Subject: Re: optimization/6627: -fno-align-functions regression from 2.95 Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Synopsis: -fno-align-functions regression from 2.95 State-Changed-From-To: analyzed->closed State-Changed-By: sayle State-Changed-When: Wed Oct 2 19:45:09 2002 State-Changed-Why: This has just been fixed on mainline CVS by the following patch: 2002-10-02 Roger Sayle PR optimization/6627 * toplev.c (force_align_functions_log): New global variable. * flags.h (force_align_functions_log): Add extern prototype. * varasm.c (assemble_start_function): Use it to force minimum function alignment. * config/i386/i386.h (FUNCTION_BOUNDARY): Set the correct minimum function alignment to one byte. (TARGET_PTRMEMFUNC_VBIT_LOCATION): Store the virtual bit in the least significant bit of vtable member function pointers. * tree.h (enum ptrmemfunc_vbit_where_t): Move definition to here from cp/cp-tree.h. http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gcc&pr=6627 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message From owner-freebsd-audit Fri Oct 4 8:35:15 2002 Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 060FE37B43D for ; Fri, 4 Oct 2002 08:35:07 -0700 (PDT) Received: from mailsrv.otenet.gr (mailsrv.otenet.gr [195.170.0.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 940E143E65 for ; Fri, 4 Oct 2002 08:35:05 -0700 (PDT) (envelope-from keramida@freebsd.org) Received: from hades.hell.gr (patr530-a120.otenet.gr [212.205.215.120]) by mailsrv.otenet.gr (8.12.6/8.12.6) with ESMTP id g94FZ16T000169 for ; Fri, 4 Oct 2002 18:35:02 +0300 (EEST) Received: from hades.hell.gr (hades [127.0.0.1]) by hades.hell.gr (8.12.6/8.12.6) with ESMTP id g94FZ2em009708 for ; Fri, 4 Oct 2002 18:35:03 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from keramida@localhost) by hades.hell.gr (8.12.6/8.12.6/Submit) id g94ElkeK006903 for audit@freebsd.org; Fri, 4 Oct 2002 17:47:46 +0300 (EEST) (envelope-from keramida@freebsd.org) Date: Fri, 4 Oct 2002 17:47:45 +0300 From: Giorgos Keramidas To: audit@freebsd.org Subject: sys/alpha/alpha message diff Message-ID: <20021004144745.GA6809@hades.hell.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I noticed that the dec_*.c files in sys/alpha/alpha use a variety of styles in the messages they print before panic(). Does the following look reasonable to those of you who know more about Alphas than me? I haven't run it through a buildkernel on beast, but that's the next step if there are no loud arguments against the change. %%% Index: dec_1000a.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_1000a.c,v retrieving revision 1.13 diff -u -r1.13 dec_1000a.c --- dec_1000a.c 22 Aug 2002 19:52:15 -0000 1.13 +++ dec_1000a.c 4 Oct 2002 14:41:31 -0000 @@ -226,11 +226,8 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %d\n", - (int)ctb->ctb_term_type); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } Index: dec_2100_a50.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_2100_a50.c,v retrieving revision 1.13 diff -u -r1.13 dec_2100_a50.c --- dec_2100_a50.c 22 Aug 2002 19:52:15 -0000 1.13 +++ dec_2100_a50.c 4 Oct 2002 14:41:44 -0000 @@ -148,10 +148,7 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %ld\n", + panic("consinit: unknown console type %ld", ctb->ctb_term_type); } } Index: dec_2100_a500.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_2100_a500.c,v retrieving revision 1.12 diff -u -r1.12 dec_2100_a500.c --- dec_2100_a500.c 22 Aug 2002 19:52:15 -0000 1.12 +++ dec_2100_a500.c 4 Oct 2002 14:41:51 -0000 @@ -133,8 +133,8 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - panic("consinit: unknown console type"); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } Index: dec_axppci_33.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_axppci_33.c,v retrieving revision 1.16 diff -u -r1.16 dec_axppci_33.c --- dec_axppci_33.c 22 Aug 2002 19:52:15 -0000 1.16 +++ dec_axppci_33.c 4 Oct 2002 14:42:09 -0000 @@ -159,10 +159,8 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type"); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } Index: dec_eb164.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_eb164.c,v retrieving revision 1.16 diff -u -r1.16 dec_eb164.c --- dec_eb164.c 22 Aug 2002 19:52:16 -0000 1.16 +++ dec_eb164.c 4 Oct 2002 14:42:18 -0000 @@ -136,11 +136,8 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %d\n", - (int)ctb->ctb_term_type); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } Index: dec_eb64plus.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_eb64plus.c,v retrieving revision 1.12 diff -u -r1.12 dec_eb64plus.c --- dec_eb64plus.c 22 Aug 2002 19:52:16 -0000 1.12 +++ dec_eb64plus.c 4 Oct 2002 14:42:29 -0000 @@ -162,11 +162,8 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %d\n", - (int)ctb->ctb_term_type); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } Index: dec_kn20aa.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_kn20aa.c,v retrieving revision 1.14 diff -u -r1.14 dec_kn20aa.c --- dec_kn20aa.c 22 Aug 2002 19:52:16 -0000 1.14 +++ dec_kn20aa.c 4 Oct 2002 14:42:38 -0000 @@ -139,11 +139,8 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %d\n", - (int)ctb->ctb_term_type); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } #if 0 Index: dec_kn300.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_kn300.c,v retrieving revision 1.9 diff -u -r1.9 dec_kn300.c --- dec_kn300.c 22 Aug 2002 19:52:16 -0000 1.9 +++ dec_kn300.c 4 Oct 2002 14:44:46 -0000 @@ -134,8 +134,7 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - panic("consinit: unknown cons type %ld\n", ctb->ctb_term_type); + panic("consinit: unknown console type %ld", + ctb->ctb_term_type); } } Index: dec_st550.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_st550.c,v retrieving revision 1.12 diff -u -r1.12 dec_st550.c --- dec_st550.c 22 Aug 2002 19:52:16 -0000 1.12 +++ dec_st550.c 4 Oct 2002 14:45:16 -0000 @@ -136,10 +136,7 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %ld\n", + panic("consinit: unknown console type %ld", ctb->ctb_term_type); } } Index: dec_st6600.c =================================================================== RCS file: /home/ncvs/src/sys/alpha/alpha/dec_st6600.c,v retrieving revision 1.13 diff -u -r1.13 dec_st6600.c --- dec_st6600.c 22 Aug 2002 19:52:16 -0000 1.13 +++ dec_st6600.c 4 Oct 2002 14:45:39 -0000 @@ -121,10 +121,7 @@ break; default: - printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type); - printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot); - - panic("consinit: unknown console type %ld\n", + panic("consinit: unknown console type %ld", ctb->ctb_term_type); } } %%% To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message