From owner-p4-projects@FreeBSD.ORG Sun Oct 2 04:34:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4B2E16A422; Sun, 2 Oct 2005 04:34:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7453F16A420 for ; Sun, 2 Oct 2005 04:34:32 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F70543D45 for ; Sun, 2 Oct 2005 04:34:32 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j924YW2q021293 for ; Sun, 2 Oct 2005 04:34:32 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j924YVXA021290 for perforce@freebsd.org; Sun, 2 Oct 2005 04:34:31 GMT (envelope-from alc@freebsd.org) Date: Sun, 2 Oct 2005 04:34:31 GMT Message-Id: <200510020434.j924YVXA021290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 84640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2005 04:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=84640 Change 84640 by alc@alc_home on 2005/10/02 04:34:26 IFC @84637 Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/superpages/src/UPDATING#2 integrate .. //depot/projects/superpages/src/etc/rc.subr#2 integrate .. //depot/projects/superpages/src/sys/dev/wi/if_wi.c#2 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -71,32 +71,47 @@ load the operating system, which has become shortened to booting. + BIOS + + Basic Input/Output SystemBIOS + On x86 hardware the Basic Input/Output System (BIOS) is responsible for loading the operating system. To do this, the BIOS looks on the hard disk for the Master Boot Record (MBR), which must be located on a specific place on the disk. The BIOS has enough knowledge to load and run the MBR, and assumes that the MBR can then carry out the rest of the - tasks involved in loading the operating system. + tasks involved in loading the operating system, + possibly with the help of the BIOS. + + Master Boot Record (MBR) + + Boot Manager - - BIOS - + Boot Loader - - Basic Input/Output System - BIOS - + The code within the MBR is usually referred to as a boot + manager, especially when it interacts with the user. In this case + the boot manager usually has more code in the first + track of the disk or within some OS's file system. (A + boot manager is sometimes also called a boot loader, + but FreeBSD uses that term for a later stage of booting.) Popular boot + managers include boot0 (a.k.a. Boot + Easy, the standard &os; boot manager), + Grub, GAG, and + LILO. + (Only boot0 fits within the MBR.) - If you only have one operating system installed on your disks then - the standard MBR will suffice. This MBR searches for the first bootable - slice on the disk, and then runs the code on that slice to load the - remainder of the operating system. + If you have only one operating system installed on your disks then + a standard PC MBR will suffice. This MBR searches for the first bootable + (a.k.a. active) slice on the disk, and then runs the code on that slice to + load the remainder of the operating system. The MBR installed by + &man.fdisk.8;, by default, is such an MBR. It is based on + /boot/mbr. If you have installed multiple operating systems on your disks then - you can install a different MBR, one that can display a list of + you can install a different boot manager, one that can display a list of different operating systems, and allows you to choose the one to boot - from. FreeBSD comes with one such MBR which can be installed, and other - operating system vendors also provide alternative MBRs. + from. Two of these are discussed in the next subsection. The remainder of the FreeBSD bootstrap system is divided into three stages. The first stage is run by the MBR, which knows just enough to @@ -122,28 +137,28 @@ - The MBR, and Boot Stages One, Two, and Three + The Boot Manager and Boot Stages + + Boot Manager - MBR, <filename>/boot/boot0</filename> + The Boot Manager Master Boot Record (MBR) - The MBR installed by FreeBSD's installer and by boot0cfg(8) - are based on /boot/boot0. The MBR is the first - sector of a disk, outside slices. (The MBR installed by fdisk(8), - by default, is based on /boot/mbr; it is - similar to the PC-DOS MBR and it boots the slice marked - active without prompting the user as the - FreeBSD MBR does.) + The code in the MBR or boot manager is sometimes referred to as + stage zero of the boot process. This subsection + discusses two of the boot managers previously mentioned: + boot0 and LILO. - boot0 is very simple, since the - program in the MBR can only be 512 bytes in - size. - (Actually, it can only be 446 bytes because of the slice - table and the 0x55AA identifier at the end of the MBR). - If you have installed the FreeBSD MBR and have installed - multiple operating systems on your hard disks then you will see a - display similar to this one at boot time: + The <application>boot0</application> Boot Manager: + The MBR installed by FreeBSD's installer or &man.boot0cfg.8;, by + default, is based on /boot/boot0. + (The boot0 program is very simple, since the + program in the MBR can only be 446 bytes long because of the slice + table and 0x55AA identifier at the end of the MBR.) + If you have installed boot0 and + multiple operating systems on your hard disks, then you will see a + display similar to this one at boot time: <filename>boot0</filename> Screenshot @@ -164,38 +179,34 @@ &prompt.root; fdisk -B -b /boot/boot0 device - Where device is the device that you + where device is the device that you boot from, such as ad0 for the first IDE disk, ad2 for the first IDE disk on a second IDE controller, da0 for the first SCSI disk, - and so on. + and so on. Or, if you want a custom configuration of the MBR, + use &man.boot0cfg.8;. + + The LILO Boot Manager: - If you are a Linux user, however, and prefer that - LILO control the boot process, you can - edit the /etc/lilo.conf file for FreeBSD, or - select - during the FreeBSD installation process. If you have installed the - FreeBSD boot manager, you can boot back into Linux and modify the - LILO configuration file - /etc/lilo.conf and add the following - option: + To install this boot manager so it will also boot FreeBSD, first + start Linux and add the following to your existing + /etc/lilo.conf configuration file: other=/dev/hdXY -table=/dev/hdb +table=/dev/hdX loader=/boot/chain.b label=FreeBSD - which will permit the booting of FreeBSD and Linux via - LILO. In our example, we use - XY to determine drive number and - partition. If you are using a SCSI drive, you - will want to change /dev/hdXY to read - something similar to /dev/sdXY, which - again uses the XY syntax. The - can be omitted if you have - both operating systems on the same drive. You can now run - /sbin/lilo -v to commit your new changes to the - system, this should be verified with screen messages. + In the above, specify FreeBSD's primary partition and drive using + Linux specifiers, replacing X with the Linux + drive letter and Y with the Linux primary + partition number. If you are using a SCSI drive, you + will need to change /dev/hd to read something + similar to /dev/sd. The + line can be omitted if you have + both operating systems on the same drive. Now run + /sbin/lilo -v to commit your new changes to the + system; this should be verified by checking its screen messages. @@ -205,17 +216,18 @@ Conceptually the first and second stages are part of the same program, on the same area of the disk. Because of space constraints they have been split into two, but you would always install them - together. + together. They are copied from the combined file + /boot/boot by the installer or + disklabel (see below). - They are found on the boot sector of - the boot slice, which is where boot0, or any other program on the - MBR expects to find the program to run to - continue the boot process. The files in the - /boot directory are copies of the real files, - which are stored outside of the FreeBSD file system. + They are located outside file systems, in the first track of + the boot slice, starting with the first sector. This is where boot0, or any other boot manager, + expects to find a program to run which will + continue the boot process. The number of sectors used is easily + determined from the size of /boot/boot. - boot1 is very simple, since it too + boot1 is very simple, since it can only be 512 bytes in size, and knows just enough about the FreeBSD disklabel, which stores information ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -863,8 +863,6 @@ (except for certain specific Internet-accessible ports, of course). - ICMP_BANDLIM - Another common DoS attack is called a springboard attack — to attack a server in a manner that causes the server to generate responses which overloads the server, the local @@ -885,10 +883,13 @@ server to saturate its outgoing network with ICMP responses. This type of attack can also crash the server by running it out of mbuf's, especially if the server cannot drain the ICMP responses - it generates fast enough. The &os; kernel has a new kernel + it generates fast enough. &os; 4.X kernels have a kernel compile option called which limits the effectiveness - of these sorts of attacks. The last major class of springboard + of these sorts of attacks. + Later kernels use the sysctl + variable net.inet.icmp.icmplim. + The last major class of springboard attacks is related to certain internal inetd services such as the udp echo service. An attacker simply spoofs a UDP packet with the ==== //depot/projects/superpages/src/UPDATING#2 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20051001: + kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) + to turn polling(4) on your interfaces. + 20050927: The old bridge(4) implementation was retired. The new if_bridge(4) serves as a full functional replacement. @@ -415,4 +419,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.421 2005/09/27 18:10:29 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.422 2005/10/01 20:53:51 glebius Exp $ ==== //depot/projects/superpages/src/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.37 2005/08/24 16:25:47 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.38 2005/10/01 20:58:03 yar Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -515,7 +515,7 @@ fi if [ -z "$rc_arg" ]; then - rc_usage "$_keywords" + rc_usage $_keywords fi if [ -n "$flags" ]; then # allow override from environment @@ -797,7 +797,7 @@ ;; *) - rc_usage "$_keywords" + rc_usage $_keywords ;; esac @@ -805,7 +805,7 @@ done echo 1>&2 "$0: unknown directive '$rc_arg'." - rc_usage "$_keywords" + rc_usage $_keywords exit 1 } ==== //depot/projects/superpages/src/sys/dev/wi/if_wi.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.191 2005/09/28 09:27:46 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.192 2005/10/02 03:55:07 avatar Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -742,7 +742,7 @@ wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_bintval); wi_write_val(sc, WI_RID_BASIC_RATE, 0x03); /* 1, 2 */ wi_write_val(sc, WI_RID_SUPPORT_RATE, 0x0f); /* 1, 2, 5.5, 11 */ - wi_write_val(sc, WI_RID_DTIM_PERIOD, 1); + wi_write_val(sc, WI_RID_DTIM_PERIOD, ic->ic_dtim_period); } /*