Browse Source

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Improve wording to be more precise and clear. No functional change intended.
  w: use locale-based string format specifiers
  Adapt linuxulator syscalls.master files to the new layout. No functional changes.
  Fix the build for an INET6 only configuration.
hardened/current/safestack
HardenedBSD Sync Service 3 months ago
parent
commit
54e38106cb
16 changed files with 6365 additions and 1832 deletions
  1. +4
    -4
      contrib/file/magic/Magdir/filesystems
  2. +1
    -1
      contrib/tcpdump/smbutil.c
  3. +4
    -4
      lib/geom/part/gpart.8
  4. +2
    -2
      stand/efi/include/efipart.h
  5. +2
    -2
      stand/i386/boot0/boot0.S
  6. +1883
    -531
      sys/amd64/linux/syscalls.master
  7. +2203
    -633
      sys/amd64/linux32/syscalls.master
  8. +2
    -2
      sys/dev/hptmv/vdevice.h
  9. +1
    -1
      sys/geom/part/g_part_mbr.c
  10. +2254
    -645
      sys/i386/linux/syscalls.master
  11. +2
    -0
      sys/netinet/sctputil.c
  12. +1
    -1
      usr.bin/fortune/datfiles/freebsd-tips
  13. +1
    -1
      usr.bin/mkimg/mbr.c
  14. +3
    -3
      usr.bin/w/w.c
  15. +1
    -1
      usr.sbin/boot0cfg/boot0cfg.8
  16. +1
    -1
      usr.sbin/boot0cfg/boot0cfg.c

+ 4
- 4
contrib/file/magic/Magdir/filesystems View File

@@ -269,8 +269,8 @@
!:strength +65
>2 string OSBS OS/BS MBR
# added by Joerg Jenderek at Feb 2013 according to https://thestarman.pcministry.com/asm/mbr/
# and https://en.wikipedia.org/wiki/Master_Boot_Record
# test for nearly all MS-DOS Master Boot Record initial program loader (IPL) is now done by
# and https://en.wikipedia.org/wiki/Main_Boot_Record
# test for nearly all MS-DOS Main Boot Record initial program loader (IPL) is now done by
# characteristic assembler instructions: xor ax,ax;mov ss,ax;mov sp,7c00
>0 search/2 \x33\xc0\x8e\xd0\xbc\x00\x7c MS-MBR
# Microsoft Windows 95A and early ( https://thestarman.pcministry.com/asm/mbr/STDMBR.htm )
@@ -436,7 +436,7 @@
>>>>>>>387 string Copyright\ (c)\ 1984,1998
>>>>>>>>411 string Caldera\ Inc.\0 \b, DR-DOS MBR (IBMBIO.LDR)
#
# tests for different MS-DOS Master Boot Records (MBR) moved and merged
# tests for different MS-DOS Main Boot Records (MBR) moved and merged
#
#>0x145 string Default:\ F \b, FREE-DOS MBR
#>0x14B string Default:\ F \b, FREE-DOS 1.0 MBR
@@ -1087,7 +1087,7 @@
>11 ubyte x \b+
>11 use DOS-filename

# https://en.wikipedia.org/wiki/Master_boot_record#PTE
# https://en.wikipedia.org/wiki/Main_boot_record#PTE
# display standard partition table
0 name partition-table
#>0 ubyte x PARTITION-TABLE


+ 1
- 1
contrib/tcpdump/smbutil.c View File

@@ -1339,7 +1339,7 @@ static const nt_err_code_struct nt_errors[] = {
{ 0xC00000A6, "STATUS_CANT_OPEN_ANONYMOUS" },
{ 0xC00000A7, "STATUS_BAD_VALIDATION_CLASS" },
{ 0xC00000A8, "STATUS_BAD_TOKEN_TYPE" },
{ 0xC00000A9, "STATUS_BAD_MASTER_BOOT_RECORD" },
{ 0xC00000A9, "STATUS_BAD_MAIN_BOOT_RECORD" },
{ 0xC00000AA, "STATUS_INSTRUCTION_MISALIGNMENT" },
{ 0xC00000AB, "STATUS_INSTANCE_NOT_AVAILABLE" },
{ 0xC00000AC, "STATUS_PIPE_NOT_AVAILABLE" },


+ 4
- 4
lib/geom/part/gpart.8 View File

@@ -582,7 +582,7 @@ Requires the
.Cm GEOM_PART_GPT
kernel option.
.It Cm MBR
Master Boot Record is used on PCs and removable media.
Main Boot Record is used on PCs and removable media.
Requires the
.Cm GEOM_PART_MBR
kernel option.
@@ -852,7 +852,7 @@ for MBR and
.Qq Li "!0657fd6d-a4ab-43c4-84e5-0933c84b4f4f"
for GPT.
.It Cm mbr
A partition that is sub-partitioned by a Master Boot Record (MBR).
A partition that is sub-partitioned by a Main Boot Record (MBR).
This type is known as
.Qq Li "!024dee41-33e7-11d3-9d69-0008c781f39f"
by GPT.
@@ -1020,7 +1020,7 @@ option.
The GEOM PART class knows how to safely embed bootstrap code into
specific partitioning scheme metadata without causing any damage.
.Pp
The Master Boot Record (MBR) uses a 512-byte bootstrap code image, embedded
The Main Boot Record (MBR) uses a 512-byte bootstrap code image, embedded
into the partition table's metadata area.
There are two variants of this bootstrap code:
.Pa /boot/mbr
@@ -1256,7 +1256,7 @@ present as independent partition.
.Em NOTE :
This may break a mirrored volume and lead to data damage.
.It Va kern.geom.part.mbr.enforce_chs : No 0
Specify how the Master Boot Record (MBR) module does alignment.
Specify how the Main Boot Record (MBR) module does alignment.
If this variable is set to a non-zero value, the module will automatically
recalculate the user-specified offset and size for alignment with the CHS
geometry.


+ 2
- 2
stand/efi/include/efipart.h View File

@@ -18,7 +18,7 @@ Module Name:
efipart.h
Abstract:
Info about disk partitions and Master Boot Records
Info about disk partitions and Main Boot Records



@@ -62,7 +62,7 @@ typedef struct {
UINT8 Unknown[2];
MBR_PARTITION_RECORD Partition[MAX_MBR_PARTITIONS];
UINT16 Signature;
} MASTER_BOOT_RECORD;
} MAIN_BOOT_RECORD;
#pragma pack()




+ 2
- 2
stand/i386/boot0/boot0.S View File

@@ -53,7 +53,7 @@
/*
* BOOT BLOCK STRUCTURE
*
* This code implements a Master Boot Record (MBR) for an Intel/PC disk.
* This code implements a Main Boot Record (MBR) for an Intel/PC disk.
* It is 512 bytes long and it is normally loaded by the BIOS (or another
* bootloader) at 0:0x7c00. This code depends on %cs:%ip being 0:0x7c00
*
@@ -68,7 +68,7 @@
* (called 'packet') or CHS mode, whether to force a drive number,
* and whether to write back the user's selection back to disk.
*
* As in every Master Boot Record, the partition table is at 0x1be,
* As in every Main Boot Record, the partition table is at 0x1be,
* made of four 16-byte entries each containing:
*
* OFF SIZE DESCRIPTION


+ 1883
- 531
sys/amd64/linux/syscalls.master
File diff suppressed because it is too large
View File


+ 2203
- 633
sys/amd64/linux32/syscalls.master
File diff suppressed because it is too large
View File


+ 2
- 2
sys/dev/hptmv/vdevice.h View File

@@ -260,13 +260,13 @@ struct fdisk_partition_table
ULONG numsect; /* number of sectors in partition */
};

typedef struct _Master_Boot_Record
typedef struct _Main_Boot_Record
{
UCHAR bootinst[446]; /* space to hold actual boot code */
struct fdisk_partition_table parts[4];
USHORT signature; /* set to 0xAA55 to indicate PC MBR format */
}
Master_Boot_Record, *PMaster_Boot_Record;
Main_Boot_Record, *PMain_Boot_Record;

#ifndef SUPPORT_ARRAY
/* TODO: move it later */


+ 1
- 1
sys/geom/part/g_part_mbr.c View File

@@ -54,7 +54,7 @@ FEATURE(geom_part_mbr, "GEOM partitioning class for MBR support");
SYSCTL_DECL(_kern_geom_part);
static SYSCTL_NODE(_kern_geom_part, OID_AUTO, mbr,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"GEOM_PART_MBR Master Boot Record");
"GEOM_PART_MBR Main Boot Record");

static u_int enforce_chs = 0;
SYSCTL_UINT(_kern_geom_part_mbr, OID_AUTO, enforce_chs,


+ 2254
- 645
sys/i386/linux/syscalls.master
File diff suppressed because it is too large
View File


+ 2
- 0
sys/netinet/sctputil.c View File

@@ -6853,6 +6853,8 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp,
} else {
addr_to_use = sa;
}
#else
addr_to_use = sa;
#endif
break;
#endif


+ 1
- 1
usr.bin/fortune/datfiles/freebsd-tips View File

@@ -40,7 +40,7 @@ Handy bash(1) prompt: PS1="\u@\h \w \!$ "
Having trouble using fetch through a firewall? Try setting the environment
variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
%
If other operating systems have damaged your Master Boot Record, you can
If other operating systems have damaged your Main Boot Record, you can
reinstall it with gpart(8). See
"man gpart" for details.
%


+ 1
- 1
usr.bin/mkimg/mbr.c View File

@@ -112,7 +112,7 @@ mbr_write(lba_t imgsz __unused, void *bootcode)

static struct mkimg_scheme mbr_scheme = {
.name = "mbr",
.description = "Master Boot Record",
.description = "Main Boot Record",
.aliases = mbr_aliases,
.metadata = mbr_metadata,
.write = mbr_write,


+ 3
- 3
usr.bin/w/w.c View File

@@ -438,8 +438,8 @@ main(int argc, char *argv[])
if (ptr == NULL)
ptr = "-";
xo_open_instance("process-entry");
xo_emit("\t\t{:process-id/%-9d/%d} {:command/%s}\n",
dkp->ki_pid, ptr);
xo_emit("\t\t{:process-id/%-9d/%d} "
"{:command/%hs}\n", dkp->ki_pid, ptr);
xo_close_instance("process-entry");
}
xo_close_list("process-entry");
@@ -460,7 +460,7 @@ main(int argc, char *argv[])
t = ep->utmp.ut_tv.tv_sec;
longattime = pr_attime(&t, &now);
longidle = pr_idle(ep->idle);
xo_emit("{:command/%.*s/%@*@s}\n",
xo_emit("{:command/%.*hs/%@*@hs}\n",
argwidth - longidle - longattime,
ep->args);



+ 1
- 1
usr.sbin/boot0cfg/boot0cfg.8 View File

@@ -68,7 +68,7 @@ boot manager on the specified
and allows various operational parameters to be configured.
.Pp
On PCs, a boot manager typically occupies sector 0 of a disk, which is
known as the Master Boot Record (MBR).
known as the Main Boot Record (MBR).
The MBR contains both code (to which control is passed by the PC BIOS)
and data (an embedded table of defined slices).
.Pp


+ 1
- 1
usr.sbin/boot0cfg/boot0cfg.c View File

@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>

#define MBRSIZE 512 /* master boot record size */
#define MBRSIZE 512 /* main boot record size */

#define OFF_VERSION 0x1b0 /* offset: version number, only boot0version */
#define OFF_SERIAL 0x1b8 /* offset: volume serial number */


Loading…
Cancel
Save