HardenedBSD/src eca3149release/tools ec2-desktop.conf

ec2-desktop: Don't enable firstboot_pkgs

We don't have any packages to install by default when the instance
first boots, so (as with the "small" flavour) don't enable the
firstboot_pkgs script.  If someone wants to launch a desktop with
packages autoinstalled at first boot, they can enable the script at
the same time as they provide the list of packages.

Sponsored by:   Amazon
DeltaFile
+1-1release/tools/ec2-desktop.conf
+1-11 files

HardenedBSD/src 28cad38release/tools ec2_setpass

ec2-desktop: Fix shell expansion in ec2_setpass

Using a backtick inside a backtick-expansion isn't a good idea; switch
instead to using $( ... ).

Fixes:  a9710349513f ("EC2: Add desktop flavour")
Sponsored by:   Amazon
DeltaFile
+1-1release/tools/ec2_setpass
+1-11 files

HardenedBSD/src ed4d267usr.sbin/acpi/acpidump acpidump.8 acpidump.h

acpidump: Add decoding of the MSDM table

Add support for dumping the Microsoft Data Management (MSDM) table,
which contains the Windows product key embedded in firmware by the OEM.

Reviewed by:    kib
Differential Revision:  https://reviews.freebsd.org/D59662
DeltaFile
+25-0usr.sbin/acpi/acpidump/acpi.c
+15-0usr.sbin/acpi/acpidump/acpidump.h
+4-1usr.sbin/acpi/acpidump/acpidump.8
+44-13 files

HardenedBSD/src 7f7e958. RELNOTES

Add release notes entry for less v710.
DeltaFile
+9-0RELNOTES
+9-01 files

HardenedBSD/src 4523eebcontrib/less lessmsg.inc lesskey.c

MFV: less v710.

MFC after:      1 week
DeltaFile
+342-280contrib/less/opttbl.c
+296-232contrib/less/screen.c
+246-129contrib/less/decode.c
+372-0contrib/less/lessmsg
+0-364contrib/less/lesskey.c
+331-0contrib/less/lessmsg.inc
+1,587-1,00552 files not shown
+3,285-1,81058 files

HardenedBSD/src 574bee4share/man/man4 dtrace_pid.4, usr.sbin/bhyve bhyve_config.5 ipc.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+51-9usr.sbin/bhyvectl/bhyvectl.c
+22-2share/man/man4/dtrace_pid.4
+11-0usr.sbin/bhyve/ipc.c
+6-2usr.sbin/bhyvectl/bhyvectl.8
+1-2usr.sbin/bhyvectl/Makefile
+1-1usr.sbin/bhyve/bhyve_config.5
+92-166 files

HardenedBSD/src f4836deshare/man/man4 dtrace_pid.4, usr.sbin/bhyve bhyve_config.5 ipc.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+51-9usr.sbin/bhyvectl/bhyvectl.c
+22-2share/man/man4/dtrace_pid.4
+11-0usr.sbin/bhyve/ipc.c
+6-2usr.sbin/bhyvectl/bhyvectl.8
+1-2usr.sbin/bhyvectl/Makefile
+1-1usr.sbin/bhyve/bhyve_config.5
+92-166 files

HardenedBSD/src 7d22bd4sys/compat/linuxkpi/common/include/linux pm.h pci.h, sys/compat/linuxkpi/common/src linux_pci.c

Merge remote-tracking branch 'rad/hardened/15-stable/main' into hardened/15-stable/pledge
DeltaFile
+54-1sys/compat/linuxkpi/common/src/linux_pci.c
+36-0sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+34-1sys/compat/linuxkpi/common/include/linux/pci.h
+17-0sys/compat/linuxkpi/common/include/linux/pm.h
+4-6sys/dev/mlx4/mlx4_core/mlx4_catas.c
+3-5sys/dev/mthca/mthca_catas.c
+148-1313 files not shown
+182-2419 files

HardenedBSD/src 360c4eashare/man/man4 dtrace_pid.4, usr.sbin/bhyve bhyve_config.5 ipc.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+51-9usr.sbin/bhyvectl/bhyvectl.c
+22-2share/man/man4/dtrace_pid.4
+11-0usr.sbin/bhyve/ipc.c
+6-2usr.sbin/bhyvectl/bhyvectl.8
+1-2usr.sbin/bhyvectl/Makefile
+1-1usr.sbin/bhyve/bhyve_config.5
+92-166 files

HardenedBSD/src 601a434sys/compat/linuxkpi/common/include/linux pm.h pci.h, sys/compat/linuxkpi/common/src linux_pci.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+54-1sys/compat/linuxkpi/common/src/linux_pci.c
+36-0sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+34-1sys/compat/linuxkpi/common/include/linux/pci.h
+17-0sys/compat/linuxkpi/common/include/linux/pm.h
+4-6sys/dev/mlx4/mlx4_core/mlx4_catas.c
+3-5sys/dev/mthca/mthca_catas.c
+148-1313 files not shown
+182-2419 files

HardenedBSD/src ed60e57usr.sbin/bhyve bhyve_config.5 ipc.c, usr.sbin/bhyvectl Makefile bhyvectl.8

bhyvectl: support querying VM pid

Extend bhyvectl(8) to support querying VM pid using the
`--get-vm-pid` flag.

This is useful in monitor mode when the VM pid differs
from the main bhyve(8) process run by the user. Knowing the VM pid
is necessary, for example, to query process resource usage or
trigger ACPI shutdown with SIGTERM.

Of course, it could be obtained by matching the monitor process
children by the process title, but it's a little more complex
and fragile than it could be.

Implement that by adding the "get_vm_pid" IPC command,
and using it to implement `bhyvectl --get-vm-pid`, which
prints the VM PID.

When the VM PID is not known, ESRCH is returned.

    [4 lines not shown]
DeltaFile
+51-9usr.sbin/bhyvectl/bhyvectl.c
+11-0usr.sbin/bhyve/ipc.c
+6-2usr.sbin/bhyvectl/bhyvectl.8
+1-2usr.sbin/bhyvectl/Makefile
+1-1usr.sbin/bhyve/bhyve_config.5
+70-145 files

HardenedBSD/src 7008192share/man/man4 dtrace_pid.4

dtrace_pid.4: Add example "Listing Program's Function Entries"

Reviewed by:    bcr
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D57515
DeltaFile
+22-2share/man/man4/dtrace_pid.4
+22-21 files

HardenedBSD/src f0c0168bin/dd args.c, bin/ed io.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+9-5bin/dd/args.c
+5-1usr.sbin/bhyveload/bhyveload.c
+2-2usr.sbin/pkg/pkg.c
+2-2sys/arm/mv/mv_cp110_icu.c
+2-2bin/ls/print.c
+1-1bin/ed/io.c
+21-136 files

HardenedBSD/src 9809f65bin/dd args.c, bin/ed io.c

Merge remote-tracking branch 'rad/hardened/current/master' into hardened/current/pledge
DeltaFile
+9-5bin/dd/args.c
+5-1usr.sbin/bhyveload/bhyveload.c
+2-2usr.sbin/pkg/pkg.c
+2-2sys/arm/mv/mv_cp110_icu.c
+2-2bin/ls/print.c
+1-1bin/ed/io.c
+21-136 files

HardenedBSD/src fada884. UPDATING, usr.sbin/bhyve pci_nvme.c

Merge remote-tracking branch 'rad/hardened/15-stable/main' into hardened/15-stable/pledge
DeltaFile
+10-0UPDATING
+1-1usr.sbin/bhyve/pci_nvme.c
+11-12 files

HardenedBSD/src 23e05c0bin/dd args.c, bin/ed io.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+9-5bin/dd/args.c
+5-1usr.sbin/bhyveload/bhyveload.c
+2-2usr.sbin/pkg/pkg.c
+2-2sys/arm/mv/mv_cp110_icu.c
+2-2bin/ls/print.c
+1-1bin/ed/io.c
+21-136 files

HardenedBSD/src 2b9f0b3. UPDATING, usr.sbin/bhyve pci_nvme.c

Merge branch 'freebsd/15-stable/main' into hardened/15-stable/main
DeltaFile
+10-0UPDATING
+1-1usr.sbin/bhyve/pci_nvme.c
+11-12 files

HardenedBSD/src 47f9e66usr.sbin/pkg pkg.c

pkg(7): Preserve const qualifier on strrchr(3) results

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59777
DeltaFile
+2-2usr.sbin/pkg/pkg.c
+2-21 files

HardenedBSD/src cc61cc7bin/ls print.c

ls(1): Preserve const qualifier on strstr(3) result

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59774
DeltaFile
+2-2bin/ls/print.c
+2-21 files

HardenedBSD/src 066fad8bin/ed io.c

ed(1): Preserve const qualifier on strchr(3) result

Reviewed by:    fuz
Approved by:    fuz (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59773
DeltaFile
+1-1bin/ed/io.c
+1-11 files

HardenedBSD/src 225612cbin/dd args.c

dd(1): Preserve const qualifier on bsearch(3) results

Reviewed by:    fuz, dteske
Approved by:    fuz (mentor), dteske (mentor)
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D59754
DeltaFile
+9-5bin/dd/args.c
+9-51 files

HardenedBSD/src 4c6e74a. UPDATING, sys/sys param.h

UPDATING: bump __FreeBSD_version to 1501503 for LinuxKPI changes

The size of multiple embedded structs have changed and may lead to
problems (pci_error_handlers in pci_driver, dev_pm_info in struct device).
Allow these changes to be detected by bumping __FreeBSD_version.

(cherry picked from commit e1ad124136deb4f270d4cef759bf9e9debdb17d3)
DeltaFile
+6-0UPDATING
+1-1sys/sys/param.h
+7-12 files

HardenedBSD/src 3ff1aeasys/compat/linuxkpi/common/include/linux pci.h

LinuxKPI: pci: add reset_{prepare,done} to pci_error_handlers

Needed by an upcoming wireless driver.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58882

(cherry picked from commit c40219c572df8b4b0c2392ee341d93bc82e6076b)
DeltaFile
+2-0sys/compat/linuxkpi/common/include/linux/pci.h
+2-01 files

HardenedBSD/src 9b0e737sys/compat/linuxkpi/common/src linux_80211.c linux_80211_macops.c

LinuxKPI: 802.11: Always lock around lkpi_80211_mo_{remove_interface,stop}()

Add the missing locking to another two MO driver downcalls, as drivers
always expect it (e.g. rtw89 by assertion).

Add the lock and might_sleep assertions to the respective lkpi_80211_mo_*
downcalls.

PR:             298417
Reviewed by:    bz
Differential Revision: https://reviews.freebsd.org/D59608

(cherry picked from commit 73166d21bd831db264509cbdce1ab3b63ab5b189)
DeltaFile
+6-0sys/compat/linuxkpi/common/src/linux_80211_macops.c
+2-0sys/compat/linuxkpi/common/src/linux_80211.c
+8-02 files

HardenedBSD/src 28ca279sys/compat/linuxkpi/common/include/linux pm.h, sys/compat/linuxkpi/common/src linux_compat.c

LinuxKPI: add can_wakeup option and accessor functions

We can implement device_set_wakeup_capable() in the !CONFIG_PM_SLEEP
case;  we do not have the infrastructure in place for the CONFIG_PM_SLEEP
case so leave a pr_debug TODO.

Needed by an upcoming wireless driver.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58883

(cherry picked from commit a424fb3519ebf8fb972e7ba45ba19df322992b00)
DeltaFile
+17-0sys/compat/linuxkpi/common/include/linux/pm.h
+6-0sys/compat/linuxkpi/common/src/linux_compat.c
+23-02 files

HardenedBSD/src 5fd93b6sys/compat/linuxkpi/common/include/linux pci.h, sys/compat/linuxkpi/common/src linux_pci.c

LinuxKPI: add PCI_IRQ_AFFINITY #define

Add the #define for PCI_IRQ_AFFINITY and leave a pr_debug note in
pci_alloc_irq_vectors() that it is unimplemented.

The flag is needed by an upcoming WiFi driver.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58881

(cherry picked from commit b589e403a2c3bd2a94fb2ab88cd23255c68a9f05)
DeltaFile
+3-0sys/compat/linuxkpi/common/src/linux_pci.c
+1-0sys/compat/linuxkpi/common/include/linux/pci.h
+4-02 files

HardenedBSD/src e44083csys/compat/linuxkpi/common/include/linux types.h

LinuxKPI: add typedef for clockid_t

Needed by a wireless driver (not really using it) to compile.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58877

(cherry picked from commit 401d0922a4bfcf40d3ae1866a0d90f955264def0)
DeltaFile
+2-0sys/compat/linuxkpi/common/include/linux/types.h
+2-01 files

HardenedBSD/src 0b1dea8sys/compat/linuxkpi/common/include/linux dma-mapping.h, sys/compat/linuxkpi/common/src linux_pci.c

LinuxKPI: implement dma_{alloc,free}_{noncoherent,attrs}

We use one to implement the other given direction stays unused.

This is needed by an upcoming wifi driver.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58880

(cherry picked from commit c3fa17a6a331db8aad03e9cb89ba97e1811ab381)
DeltaFile
+50-0sys/compat/linuxkpi/common/src/linux_pci.c
+36-0sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+86-02 files

HardenedBSD/src 4909288sys/compat/linuxkpi/common/include/linux interrupt.h pci.h, sys/compat/linuxkpi/common/src linux_pci.c

LinuxKPI: fix argument type to lkpi_pci_msi_desc_alloc()

lkpi_pci_msi_desc_alloc() takes an unsigned int, not an int.
While here make sure the prototype is visibile in interrupt.h as
well before use to avoid -Wimplicit-function-declaration errors.

Discovered while working on a wireless driver.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58879

(cherry picked from commit cfb23b01e269e8a0a84066637b82b746f01b46b4)
DeltaFile
+2-1sys/compat/linuxkpi/common/include/linux/pci.h
+1-1sys/compat/linuxkpi/common/src/linux_pci.c
+1-0sys/compat/linuxkpi/common/include/linux/interrupt.h
+4-23 files

HardenedBSD/src 67c01ebsys/compat/linuxkpi/common/include/linux pci.h

LinuxKPI: pci: add pci_select_bars() and pci_msix_vec_count()

For pci_select_bars() we use the LinuxKPI internal information, while
for pci_select_bars() we fall back to the native PCI stack.

Needed by a wifi driver.

Reviewed by:    dumbbell
Differential Revision: https://reviews.freebsd.org/D58878

(cherry picked from commit 55c07af60172b211116be47010fc0831aafc99e8)
DeltaFile
+29-0sys/compat/linuxkpi/common/include/linux/pci.h
+29-01 files