svn commit: r223706 - head/sys/netgraph/netflow
Author: glebius
Date: Fri Jul 1 08:27:03 2011
New Revision: 223706
URL: http://svn.freebsd.org/changeset/base/223706
Log:
Fix double free.
Submitted by: Alexander V. Chernikov melifaro ipfw.ru
Modified:
head/sys/netgraph/netflow/netflow_v9.c
Modified: head/sys/netgraph/netflow/netflow_v9.c
==
--- head/sys/netgraph/netflow/netflow_v9.c Fri Jul 1 03:29:49 2011
(r223705)
+++ head/sys/netgraph/netflow/netflow_v9.c Fri Jul 1 08:27:03 2011
(r223706)
@@ -398,7 +398,6 @@ get_export9_dgram(priv_p priv, fib_expor
item = ng_package_data(m, NG_NOFLAGS);
if (item == NULL) {
- m_free(m);
free(t, M_NETFLOW_GENERAL);
return (NULL);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223708 - head/bin/ps
Author: pluknet Date: Fri Jul 1 10:54:47 2011 New Revision: 223708 URL: http://svn.freebsd.org/changeset/base/223708 Log: Update and sort the list of the available keywords. Modified: head/bin/ps/ps.1 Modified: head/bin/ps/ps.1 == --- head/bin/ps/ps.1Fri Jul 1 10:25:48 2011(r223707) +++ head/bin/ps/ps.1Fri Jul 1 10:54:47 2011(r223708) @@ -492,6 +492,8 @@ command command and arguments .It Cm cpu short-term CPU usage factor (for scheduling) +.It Cm emul +system-call emulation environment .It Cm etime elapsed running time, format .Op days- Ns @@ -527,6 +529,8 @@ lock currently blocked on (as a symbolic login name of user who started the session .It Cm lstart time started +.It Cm lwp +process thread-id .It Cm majflt total page faults .It Cm minflt @@ -542,6 +546,8 @@ nice value (alias .Cm ni ) .It Cm nivcsw total involuntary context switches +.It Cm nlwp +number of threads tied to a process .It Cm nsigs total signals taken (alias .Cm nsignals ) @@ -562,8 +568,6 @@ pageins (same as majflt) process group number .It Cm pid process ID -.It Cm poip -pageouts in progress .It Cm ppid parent process ID .It Cm pri @@ -574,8 +578,6 @@ core residency time (in seconds; 127 = i real group ID .It Cm rgroup group name (from rgid) -.It Cm rlink -reverse link on run queue, or 0 .It Cm rss resident set size .It Cm rtprio @@ -630,8 +632,6 @@ text size (in Kbytes) control terminal name (two letter abbreviation) .It Cm tty full name of control terminal -.It Cm uprocp -process pointer .It Cm ucomm name to be used for accounting .It Cm uid @@ -640,6 +640,8 @@ effective user ID (alias .It Cm upr scheduling priority on return from system call (alias .Cm usrpri ) +.It Cm uprocp +process pointer .It Cm user user name (from UID) .It Cm usertime ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223709 - head/bin/ps
Author: pluknet Date: Fri Jul 1 10:57:10 2011 New Revision: 223709 URL: http://svn.freebsd.org/changeset/base/223709 Log: Bump date after the previous commit. Modified: head/bin/ps/ps.1 Modified: head/bin/ps/ps.1 == --- head/bin/ps/ps.1Fri Jul 1 10:54:47 2011(r223708) +++ head/bin/ps/ps.1Fri Jul 1 10:57:10 2011(r223709) @@ -29,7 +29,7 @@ .\ @(#)ps.1 8.3 (Berkeley) 4/18/94 .\ $FreeBSD$ .\ -.Dd June 14, 2011 +.Dd July 1, 2011 .Dt PS 1 .Os .Sh NAME ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223710 - head/sys/sys
Author: jonathan Date: Fri Jul 1 12:13:48 2011 New Revision: 223710 URL: http://svn.freebsd.org/changeset/base/223710 Log: Define cap_rights_t and DTYPE_CAPABILITY, which are required to implement Capsicum capabilities. Approved by: mentor (rwatson), re (bz) Modified: head/sys/sys/_types.h head/sys/sys/file.h head/sys/sys/types.h Modified: head/sys/sys/_types.h == --- head/sys/sys/_types.h Fri Jul 1 10:57:10 2011(r223709) +++ head/sys/sys/_types.h Fri Jul 1 12:13:48 2011(r223710) @@ -38,6 +38,7 @@ typedef__uint32_t __blksize_t;/* file block size */ typedef__int64_t __blkcnt_t; /* file block count */ typedef__int32_t __clockid_t;/* clock_gettime()... */ +typedef__uint64_t __cap_rights_t; /* capability rights */ typedef__uint32_t __fflags_t; /* file flags */ typedef__uint64_t __fsblkcnt_t; typedef__uint64_t __fsfilcnt_t; Modified: head/sys/sys/file.h == --- head/sys/sys/file.h Fri Jul 1 10:57:10 2011(r223709) +++ head/sys/sys/file.h Fri Jul 1 12:13:48 2011(r223710) @@ -64,6 +64,7 @@ struct socket; #defineDTYPE_SEM 9 /* posix semaphore */ #defineDTYPE_PTS 10 /* pseudo teletype master device */ #defineDTYPE_DEV 11 /* Device specific fd type */ +#defineDTYPE_CAPABILITY12 /* capability */ #ifdef _KERNEL Modified: head/sys/sys/types.h == --- head/sys/sys/types.hFri Jul 1 10:57:10 2011(r223709) +++ head/sys/sys/types.hFri Jul 1 12:13:48 2011(r223710) @@ -89,6 +89,8 @@ typedef __blkcnt_t blkcnt_t; #define_BLKCNT_T_DECLARED #endif +typedef__cap_rights_t cap_rights_t; + #ifndef _CLOCK_T_DECLARED typedef__clock_t clock_t; #define_CLOCK_T_DECLARED ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223712 - in head/sys/boot: common userboot/userboot
Author: marius
Date: Fri Jul 1 18:31:59 2011
New Revision: 223712
URL: http://svn.freebsd.org/changeset/base/223712
Log:
Fix r223695 to compile on architectures which don't use the MBR scheme; wrap
the MBR support in the common part of the loader in #ifdef's and enable it
only for userboot for now.
Modified:
head/sys/boot/common/disk.c
head/sys/boot/userboot/userboot/Makefile
Modified: head/sys/boot/common/disk.c
==
--- head/sys/boot/common/disk.c Fri Jul 1 12:30:34 2011(r223711)
+++ head/sys/boot/common/disk.c Fri Jul 1 18:31:59 2011(r223712)
@@ -93,6 +93,8 @@ static uuid_t ms_basic_data = GPT_ENT_TY
#endif
+#if defined(LOADER_GPT_SUPPORT) || defined(LOADER_MBR_SUPPORT)
+
/* Given a size in 512 byte sectors, convert it to a human-readable number. */
static char *
display_size(uint64_t size)
@@ -116,6 +118,10 @@ display_size(uint64_t size)
return (buf);
}
+#endif
+
+#ifdef LOADER_MBR_SUPPORT
+
static void
disk_checkextended(struct disk_devdesc *dev,
struct dos_partition *slicetab, int slicenum, int *nslicesp)
@@ -469,7 +475,7 @@ disk_printslice(struct disk_devdesc *dev
pager_output(line);
}
-int
+static int
disk_printmbr(struct disk_devdesc *dev, char *prefix, int verbose)
{
struct dos_partition*slicetab;
@@ -488,6 +494,8 @@ disk_printmbr(struct disk_devdesc *dev,
return (0);
}
+#endif
+
#ifdef LOADER_GPT_SUPPORT
static int
@@ -630,7 +638,7 @@ disk_bestgpt(struct gpt_part *gpt, int n
return (prefpart);
}
-int
+static int
disk_opengpt(struct disk_devdesc *dev)
{
struct gpt_part *gpt = NULL, *gp;
@@ -759,6 +767,7 @@ disk_open(struct disk_devdesc *dev)
{
int rc;
+ rc = 0;
/*
* While we are reading disk metadata, make sure we do it relative
* to the start of the disk
@@ -769,7 +778,9 @@ disk_open(struct disk_devdesc *dev)
rc = disk_opengpt(dev);
if (rc)
#endif
+#ifdef LOADER_MBR_SUPPORT
rc = disk_openmbr(dev);
+#endif
return (rc);
}
@@ -777,12 +788,12 @@ disk_open(struct disk_devdesc *dev)
void
disk_print(struct disk_devdesc *dev, char *prefix, int verbose)
{
- int rc;
#ifdef LOADER_GPT_SUPPORT
- rc = disk_printgpt(dev, prefix, verbose);
- if (rc == 0)
+ if (disk_printgpt(dev, prefix, verbose) == 0)
return;
#endif
+#ifdef LOADER_MBR_SUPPORT
disk_printmbr(dev, prefix, verbose);
+#endif
}
Modified: head/sys/boot/userboot/userboot/Makefile
==
--- head/sys/boot/userboot/userboot/MakefileFri Jul 1 12:30:34 2011
(r223711)
+++ head/sys/boot/userboot/userboot/MakefileFri Jul 1 18:31:59 2011
(r223712)
@@ -32,7 +32,7 @@ CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
CFLAGS+= -ffreestanding -I.
-CFLAGS+= -DLOADER_GPT_SUPPORT
+CFLAGS+= -DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT
LDFLAGS+= -nostdlib -Wl,-Bsymbolic
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223713 - head/sbin/natd
Author: sem (ports committer) Date: Fri Jul 1 19:22:27 2011 New Revision: 223713 URL: http://svn.freebsd.org/changeset/base/223713 Log: Fix a typo. Approved by: kib Modified: head/sbin/natd/natd.8 Modified: head/sbin/natd/natd.8 == --- head/sbin/natd/natd.8 Fri Jul 1 18:31:59 2011(r223712) +++ head/sbin/natd/natd.8 Fri Jul 1 19:22:27 2011(r223713) @@ -473,7 +473,7 @@ This option is intended to be used with packets received on this port are checked against internal translation tables of every configured instance. If an entry is found, packet is aliased according to that entry. -In no entry was found in any of the instances, packet is passed +If no entry was found in any of the instances, packet is passed unchanged, and no new entry will be created. See the section .Sx MULTIPLE INSTANCES ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223715 - head/contrib/gcc
Author: uqs
Date: Fri Jul 1 20:45:55 2011
New Revision: 223715
URL: http://svn.freebsd.org/changeset/base/223715
Log:
- Fix typo in check_for_nested_with_variably_modified present
- Implement -Wvariable-decl.
- Port -Wtrampolines support from gcc3.
(all three also via OpenBSD)
PR: gnu/127136, gnu/157019
Submitted by: Henning Petersen, Pedro Giffuni
MFC after:6 weeks
Modified:
head/contrib/gcc/c-decl.c
head/contrib/gcc/c.opt
head/contrib/gcc/common.opt
head/contrib/gcc/tree-nested.c
Modified: head/contrib/gcc/c-decl.c
==
--- head/contrib/gcc/c-decl.c Fri Jul 1 19:23:25 2011(r223714)
+++ head/contrib/gcc/c-decl.c Fri Jul 1 20:45:55 2011(r223715)
@@ -4340,6 +4340,8 @@ grokdeclarator (const struct c_declarato
pedwarn (ISO C90 forbids variable-size array %qs,
name);
}
+ if (warn_variable_decl)
+ warning (0, variable-sized array %qs, name);
}
if (integer_zerop (size))
Modified: head/contrib/gcc/c.opt
==
--- head/contrib/gcc/c.opt Fri Jul 1 19:23:25 2011(r223714)
+++ head/contrib/gcc/c.opt Fri Jul 1 20:45:55 2011(r223715)
@@ -404,6 +404,10 @@ Wtraditional
C ObjC Var(warn_traditional)
Warn about features not present in traditional C
+Wtrampolines
+Common Var(warn_trampolines)
+Warn when trampolines are emitted
+
Wtrigraphs
C ObjC C++ ObjC++
Warn if trigraphs are encountered that might affect the meaning of the program
Modified: head/contrib/gcc/common.opt
==
--- head/contrib/gcc/common.opt Fri Jul 1 19:23:25 2011(r223714)
+++ head/contrib/gcc/common.opt Fri Jul 1 20:45:55 2011(r223715)
@@ -189,6 +189,10 @@ Wunused-variable
Common Var(warn_unused_variable)
Warn when a variable is unused
+Wvariable-decl
+Common Var(warn_variable_decl)
+Warn about variable-sized declarations.
+
Wvolatile-register-var
Common Var(warn_register_var)
Warn when a register variable is declared volatile
Modified: head/contrib/gcc/tree-nested.c
==
--- head/contrib/gcc/tree-nested.c Fri Jul 1 19:23:25 2011
(r223714)
+++ head/contrib/gcc/tree-nested.c Fri Jul 1 20:45:55 2011
(r223715)
@@ -750,7 +750,7 @@ check_for_nested_with_variably_modified
for (cgn = cgn-nested; cgn ; cgn = cgn-next_nested)
{
for (arg = DECL_ARGUMENTS (cgn-decl); arg; arg = TREE_CHAIN (arg))
- if (variably_modified_type_p (TREE_TYPE (arg), 0), orig_fndecl)
+ if (variably_modified_type_p (TREE_TYPE (arg), orig_fndecl))
return true;
if (check_for_nested_with_variably_modified (cgn-decl, orig_fndecl))
@@ -1621,6 +1621,10 @@ convert_tramp_reference (tree *tp, int *
it doesn't need a trampoline. */
if (DECL_NO_STATIC_CHAIN (decl))
break;
+ if (warn_trampolines)
+ {
+ warning(0, local function address taken needing trampoline
generation);
+ }
/* Lookup the immediate parent of the callee, as that's where
we need to insert the trampoline. */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
