117170 Commits

Author SHA1 Message Date
nyan
a3a2b08eb8 MFC: revision 1.54 (Implement g_ctl api).
Approved by:	re (kensmith)
2005-08-19 12:40:32 +00:00
pjd
354d9a41b6 MFC: sys/opencrypto/cryptodev.c 1.26
Fix bogus check. It was possible to panic the kernel by giving 0 length.
This is actually a local DoS, as every user can use /dev/crypto if there
is crypto hardware in the system and cryptodev.ko is loaded (or compiled
into the kernel).

Reported by:    Mike Tancsa <mike@sentex.net>
Security:	Local DoS on systems with crypto HW and with /dev/crypto available
Approved by:	re (kensmith)
2005-08-19 12:04:19 +00:00
pjd
c9e4dff1ad MFC: usr.sbin/jls/jls.c 1.4,1.5
Not sure why, but SYSCTL_OUT() can sometimes keep returning ENOMEM
in sysctl_jail_list(). Because of this, jls(8) could enter into
an endless loop. The strange thing is, that we can call jls(8) while
the other one is in loop and it will succeed - SYSCTL_OUT() will
not return ENOMEM there.

Approved by:	re (kensmith)
2005-08-19 11:09:11 +00:00
glebius
10a0fa240e MFC:
Implement a new feature for ping(8) - sweeping pings. In a sweeping
  ping ICMP payload of packets being sent is increased with given step.
  Sweeping pings are useful for testing problematic channels, MTU
  issues or traffic policing functions in networks.

  PR:		bin/82625
  Submitted by:	Chris Hellberg <chellberg juniper.net> (with some cleanups)

Approved by:	re (kensmith)
2005-08-19 09:29:25 +00:00
le
60ff518762 MFC:
geom_vinum.c        rev. 1.17
  geom_vinum_drive.c  rev. 1.19
  geom_vinum_plex.c   rev. 1.16
  geom_vinum_rm.c     rev. 1.7
  geom_vinum_var.h    rev. 1.9, 1.10
  geom_vinum_volume.c rev. 1.9

Approved by:  re (kensmith)
2005-08-19 08:48:04 +00:00
csjp
9c24f2345e MFC revision 1.157
date: 2005/08/18 22:30:52;  author: csjp;  state: Exp;  lines: +4 -2
Add missing braces around bpf_filter which were missed when I
merged the bpfstat code.

Approved by:	re (kensmith)
2005-08-19 04:52:02 +00:00
csjp
20f8edeaa1 Synch with HEAD:
MFC revision 1.167
date: 2005/08/08 21:06:42;  author: csjp;  state: Exp;  lines: +2 -0
Drop in a WITNESS_WARN into SYSCTL_IN to make sure that we are
not holding any non-sleep-able-locks locks when copyin is called.
This gets executed un-conditionally since we have no function
to wire the buffer in this direction.

MFC revision 1.166
date: 2005/08/08 18:54:35;  author: csjp;  state: Exp;  lines: +6 -1
Check to see if we wired the user-supplied buffers in SYSCTL_OUT, if
the buffer has not been wired and we are holding any non-sleep-able locks,
drop a witness warning. If the buffer has not been wired, it is possible
that the writing of the data can sleep, especially if the page is not in
memory. This can result in a number of different locking issues, including
dead locks.

Approved by:	re (kensmith)
2005-08-19 04:50:08 +00:00
cperciva
a0c5d836f0 MFC: Pad the strings sccs[], version[], and osrelease[], and add a
BRANCH_OVERRIDE environment variable (which, if set, overrides the
BRANCH specified here).  These make my FreeBSD Update build code
simpler by making it easier to recognize when two kernels are identical
modulo version numbers.

Approved by:	re (kensmith)
2005-08-19 04:12:41 +00:00
marcel
58aac0d793 MFC 1.3: Fix backtraces.
Approved by: re (kensmith)
2005-08-19 04:02:34 +00:00
murray
4dd55d84fc MFC: correct date, fix typos, add 07/07 london bombing entry.
Approved by:	re (kensmith)
2005-08-19 03:23:07 +00:00
cperciva
4fbe57a600 MFC: Remove dates, since they serve no purpose and result in files
spuriosuly changing each time they are built.  Also add $FreeBSD$ tags,
because cvs wants them.

Approved by:	re (kensmith)
2005-08-19 02:53:00 +00:00
cperciva
4734b475da MFC: Add -frandom-seed=RepeatabilityConsideredGood to CFLAGS in order
to make this library build repeatably.

Approved by:	re (kensmith)
2005-08-19 02:49:55 +00:00
thompsa
44ed345e28 MFC: if_bridge.c, r1.17; bridgestp.c, r1.5
>   Ensure that we are holding the lock when initialising the bridge interface. We
>   could initialise while unlocked if the bridge is not up when setting the inet
>   address, ether_ioctl() would call bridge_init.
>
>   Change it so bridge_init is always called unlocked and then locks before
>   calling bstp_initialization().

Approved by:	re (kensmith), mlaier (mentor)
2005-08-19 02:43:07 +00:00
rwatson
2071d66142 Merge Makefile:1.12, vmstat.c:1.87 from HEAD to RELENG_6:
Teach vmstat -m and vmstat -z to use libmemstat(3).  Certain
  statistics from -z are now a bit different due to changes in the
  way statistics are now measured.  Reproduce with some amount of
  accuracy the slightly obscure layouts adopted by the two kernel
  sysctls.  In the future, we might want to normalize them.

  GC dosysctl(), which is now no longer used.

Merge vmstat.c:1.88 from HEAD to RELENG_6:

  Minor syntax tweaks:

  - Remove some extra blank lines.
  - Remove comments that don't contribute to understanding.
  - Remove additional blank lines in output added to maximize
    compatibility with older vmstat output, but that is actually
    somewhat gratuitous.

  Submitted by:   bde

Approved by:	re (kensmith)
2005-08-19 00:07:06 +00:00
rwatson
b7201f0455 Merge if.c:1.238 from HEAD to RELENG_6:
In multicast routines:

  Compare pointers with NULL rather than treating them as booleans.

  Compare pointers with NULL rather than 0 to make it more clear
  they are pointers.

  Assign pointers value of NULL rather than 0 to make it more clear
  they are pointers.

Approved by:	re (kensmith)
2005-08-18 18:36:53 +00:00
rwatson
82b242b793 Merge if.c:1.237 from HEAD to RELENG_6:
Rename equal() macro to sa_equal(), which matches the definitions
  of sa_equal() in other files, and makes it more clear what equal()
  is comparing.

Approved by:	re (kensmith)
2005-08-18 18:34:23 +00:00
keramida
0467614a12 MFC spelling fixes of several manpages.
Approved by:	re (kensmith)

The merged revisions/files are:

Revision  Path
1.10      src/lib/libarchive/archive_entry.3
1.21      src/lib/libarchive/archive_read.3
1.8       src/lib/libautofs/libautofs.3
1.10      src/lib/libc/net/inet6_rth_space.3
1.8       src/lib/libc/posix1e/acl_get_entry.3
1.15      src/lib/libc/posix1e/mac.3
1.7       src/lib/libc/posix1e/mac_prepare.3
1.37      src/lib/libc/stdtime/strftime.3
1.16      src/lib/libc/sys/kse.2
1.8       src/lib/libc/sys/uuidgen.2
1.4       src/share/man/man4/man4.i386/acpi_ibm.4
1.6       src/share/man/man4/man4.i386/acpi_panasonic.4
1.40      src/share/man/man4/man4.i386/ep.4
1.6       src/share/man/man4/man4.i386/pbio.4
1.5       src/share/man/man4/man4.i386/snc.4
1.2       src/share/man/man4/man4.sparc64/openprom.4
1.4       src/share/man/man4/man4.sparc64/snd_audiocs.4
1.11      src/share/man/man4/witness.4
1.3       src/share/man/man5/devfs.conf.5
1.51      src/share/man/man9/ifnet.9
1.7       src/share/man/man9/printf.9
1.12      src/usr.bin/file2c/file2c.1
1.27      src/usr.bin/indent/indent.1
1.17      src/usr.bin/lockf/lockf.1
1.90      src/usr.bin/make/make.1
1.45      src/usr.bin/systat/systat.1
1.19      src/usr.bin/truss/truss.1
1.33      src/usr.bin/xinstall/install.1
1.11      src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
1.4       src/usr.sbin/bluetooth/sdpd/sdpd.8
1.9       src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
1.36      src/usr.sbin/i4b/isdnd/isdnd.rc.5
1.53      src/usr.sbin/mtree/mtree.8
1.8       src/usr.sbin/ndiscvt/ndiscvt.8
1.13      src/usr.sbin/ntp/doc/ntpdc.8
1.26      src/usr.sbin/pppd/pppd.8
1.40      src/usr.sbin/syslogd/syslog.conf.5
1.5       src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
2005-08-18 15:01:27 +00:00
grehan
1d5766d54e MFC: r1.141
>restore the ability to mount cd9660 filesystems as root by inverting
    >some of the options test, specifically the joliet and rockridge tests.
    > ...

Approved by:	re (Ken Smith)
2005-08-18 11:32:06 +00:00
grehan
a43a477eb1 MFC: r1.8
> Remove unnecessary and alarming printf.

Approved by:	re (Ken Smith)
2005-08-18 11:03:53 +00:00
glebius
643ba77aa4 MFC 1.126:
To prevent a race between RTM_DELETE message and
  arptimer() deleting stale entry, we need to lock
  rtentry before unlocking radix head.

Approved by:	re (kensmith)
2005-08-18 10:15:25 +00:00
glebius
c6a0e452c9 MFC 1.139, that closes several races in ARP code. See original
commit log for more information.

Approved by:	re (kensmith)
2005-08-18 10:14:22 +00:00
glebius
6f71a877bf o Make rt_check() return a locked rtentry.
o Make rt_check() function more strict:
  - rt0 passed to rt_check() must not be NULL, assert this.
  - rt returned by rt_check() must be valid locked rtentry,
    if no error occured.
o Modify callers, so that they never pass NULL rt0
  to rt_check().
o Modify callers, so that they unlock rtentry.

Revisions merged:

net/if_atmsubr.c	- 1.39, 1.41
net/if_fwsubr.c		- 1.13, 1.15
net/if_iso88025subr.c	- 1.69, 1.71
net/route.c		- 1.110, 1.111
netinet6/nd6.c		- 1.51-1.53

netinet/if_ether.c intentionally not touched by this merge.

Approved by:	re (kensmith)
2005-08-18 10:12:42 +00:00
suz
922265190b MFC: IPv6 stealth forwarding
Revision  Changes    Path
   1.39      +3 -1      src/sys/netinet6/in6.h
   1.35      +8 -0      src/sys/netinet6/in6_proto.c
   1.30      +8 -0      src/sys/netinet6/ip6_forward.c
   1.34      +3 -0      src/sys/netinet6/ip6_var.h

PR: kern/54625
Approved by: re(kensmith)
2005-08-18 09:01:48 +00:00
ken
3b826aab9c MFC, rev 1.28:
Remove a reference to compute_stats(), since it is no longer documented at
least.

Submitted by:	osa
Approved by:	re (hrs)
2005-08-18 04:46:26 +00:00
avatar
ac8bcca698 MFC: (1.26) Fixing a regression introduced in rev1.25 by honouring the errno.
This should keep 'ugidfw list' to stop complaining about "Data error in
security.mac.bsdextended.rules.N: Unknown error: 0" if there is a "hole"
within the rule set.

Approved by:	re (hrs)
2005-08-17 14:35:20 +00:00
cperciva
6a29a52c26 MFC revision 1.149: Change the default partition sizes to provide more
space in /, /var, and /tmp, and if the device is large enough, provide
extra space to /var sufficient to store a crash dump.

Approved by:	re (kensmith)
2005-08-17 13:53:11 +00:00
kensmith
704cef6b45 MFC v1.125:
>   Log:
>   The /stand directory now disappears out from under sysinstall while
>   it is running during installations.  The vsystem() function does get
>   used after this happens (e.g. if you manually configure the network
>   interface and ask it to enable the interface) so it needs to be a
>   little smarter about whether it uses /stand/sh or /bin/sh.

Approved by:	re (hrs)
2005-08-17 13:32:29 +00:00
thompsa
3dfb8775ca MFC: ifconfig.8, r1.101
> Document two missed if_bridge commands 'addr' and 'static'.

Approved by:	re (hrs), mlaier (mentor)
2005-08-17 02:27:08 +00:00
phk
9d0c63296b MFC: Pull in stuff from -current.
Approved by:	re@
2005-08-16 22:49:11 +00:00
phk
d5f6d4f261 MFC: fix a bug relating to multiple (>2) data sets.
Approved by:	re@
2005-08-16 22:48:12 +00:00
phk
1bc819216b MFC: better facility for extracting and inspecting BIOS strings.
Approved by:	re@
2005-08-16 22:47:14 +00:00
phk
abc7f53327 MFC: use g_ctl for metadata modification if possible.
Approved by:	re@
2005-08-16 22:46:05 +00:00
phk
a28f269dc8 MFC: use g_ctl for modifying metadata if possible.
Approved by:	re@
2005-08-16 22:45:33 +00:00
phk
7b495a458a MFC: Implement g_ctl api for metadata modification.
Approved by:	re@
2005-08-16 22:44:39 +00:00
phk
a79bee48a4 MFC: fix a tiny race in statistics collection.
Approved by:	re@
2005-08-16 22:43:51 +00:00
phk
9414cb0e98 MFC: Remove map3270 file, telnet3270 is long gone.
Approved by:	re@
2005-08-16 22:42:46 +00:00
phk
f20506c826 MFC: fix typo in debugging statement.
Approved by:	re@
2005-08-16 22:41:39 +00:00
phk
8257c62ab8 MFC: Remove vttest program, it lives in ports.
Approved by:	re@
2005-08-16 22:40:54 +00:00
phk
1ca93d7c74 Remove paper about the Berkeley Pascal Runtime which we have never had
in FreeBSD because it was VAX specific.

Approved by:	re@
2005-08-16 22:39:27 +00:00
phk
a2d3a9f45d Remove pointless formatting date.
Approved by: re@
2005-08-16 22:36:54 +00:00
brueffer
4ef6dbcae2 MFC: rev. 1.11
- add missing ether_poll_deregister
- add per-device polling
- move the setting of if_capenable further down so that the
  VLAN caps are honored as well

Approved by:	re (kensmith), ru
2005-08-16 20:49:47 +00:00
cvs2svn
42fe58c4c6 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2005-08-16 19:08:02 +00:00
pjd
c46b3075d6 MFC: share/man/man5/rc.conf.5 1.258,1.259,1.260
etc/defaults/rc.conf		1.255,1.256,1.257

- Remove gbde_swap_enable variable (it has no effect).
- Add geli_swap_flags variable which holds flags used by geli(8) when
  configuring GELI-encrypted swap partitions.
- Add variables used by rc.d/geli and rc.d/geli2 scripts.

Approved by:	re (kensmith)
2005-08-16 09:30:13 +00:00
pjd
df87555c46 MFC: etc/rc.d/Makefile 1.54,1.55
- Disconnect gbde_swap from the build.
- Connect encswap, geli and geli2 to the build.

Approved by:	re (kensmith)
2005-08-16 09:23:45 +00:00
pjd
5e9dfe467b MFC:
Add scripts for GELI device configuration on boot.

rc.d/geli - configures encryption (ask for passphrases, etc.);
rc.d/geli2 - is called after file systems are mounted and mark devices for
             detach on last close.

Approved by:	re (kensmith)
2005-08-16 09:20:32 +00:00
rwatson
57631d7474 Merge if_var.h:1.100 from HEAD to RELENG_6:
Add if_addr_mtx to struct ifnet, a mutex to protect ifnet-related address
  lists.  Add accessor macros.

  This changes the size of struct ifnet, but ideally, all ifnet consumers
  are now using if_alloc() to allocate these structures rather than
  embedding them into device driver softc's, so this won't modify the
  network device driver ABI.

Approved by:	re (hrs)
2005-08-16 09:15:14 +00:00
pjd
65039f9b63 MFC: etc/rc.subr 1.36
Add a function which creates list of devices for GELI-encryption.

Approved by:	re (kensmith)
2005-08-16 09:06:42 +00:00
pjd
e2d3543699 MFC: Remove gbde_swap script and introduce encswap script, which knows how to
encrypt swap partitions using both: gbde and geli.

Approved by:	re (kensmith)
2005-08-16 09:04:55 +00:00
pjd
b432c993ef MFC: sbin/geom/class/eli/geom_eli.c 1.2
When keys were configured without passphrase, number of iterations in
metadata is equal to -1. if we then wanted to attach provider (or change
keys) and forget about '-p' flag it failed on assertion (quite ok, without
assertion it could call PKCS#5v2 with 4294967295 iterations).

Instead of failing on assertion, remind about '-p' flag.

Approved by:	re (kensmith)
2005-08-16 09:02:22 +00:00
pjd
00e8438663 MFC: sys/geom/eli/g_eli.h 1.2
Be case-insensitive when dealing with algorithm names.

Submitted by:	Benjamin Lutz <benlutz@datacomm.ch>
PR:		kern/84659
Approved by:	re (kensmith)
2005-08-16 09:00:24 +00:00