Paths

Table of Contentst

-
head/
-
sys/kern/
-
kern/
-
kern_exit.c
-
tests/sys/kern/
-
sys/
-
kern/
-
ptrace_test.c

Differential D19825

Set the oppid field of orphans when exiting.
ClosedPublic
Actions

Authored by markj on Apr 5 2019, 12:50 AM.

Details

Reviewers

kib
mjg

Commits

rS346009: Set the p_oppid field of orphans when exiting.

Summary

Such processes will be reparented to the reaper when the current parent
is done with them; oppid must be updated accordingly. Otherwise, the
p->p_oppid != p->p_pptr->p_pid check in proc_reap() will always fail.

Test Plan

Peter tested the patch.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Apr 5 2019, 12:50 AM

Herald added a subscriber: emaste. · View Herald TranscriptApr 5 2019, 12:50 AM

Harbormaster completed remote builds in B23524: Diff 55821.Apr 5 2019, 12:50 AM

markj edited the test plan for this revision. (Show Details)Apr 5 2019, 12:52 AM

markj added reviewers: kib, mjg.

mjg accepted this revision.Apr 5 2019, 12:57 AM

This revision is now accepted and ready to land.Apr 5 2019, 12:57 AM

kib accepted this revision.Apr 5 2019, 9:09 AM

Closed by commit rS346009: Set the p_oppid field of orphans when exiting. (authored by markj). · Explain WhyApr 7 2019, 2:26 PM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: imp. · View Herald TranscriptApr 7 2019, 2:26 PM

Revision Contents
Changeset List

Path

Size

head/

sys/

kern/

kern_exit.c

5 lines

tests/

sys/

kern/

ptrace_test.c

62 lines

Diff 55904

View Options

head/sys/kern/kern_exit.c

This file was added.

				#!/bin/sh
				#
				# $FreeBSD$
				#

				# Set to a list of packages to install.
				# TODO waiting for devel/oci-cli to build in quarterly to swap out py-oci
				export VM_EXTRA_PACKAGES="
				emasteUnsubmitted Done Inline Actions should be in alpha order? emaste: should be in alpha order?
				dchAuthorUnsubmitted Done Inline Actions This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as well) which I backported to quarterly last week. It's not yet gotten through the build pipeline: pkg: No packages available to install matching 'devel/oci-cli' have been found in the repositories dch: This is the placeholder for devel/oci-cli (the command line tool, that depends on py-oci as…
				comms/py-pyserial
				emasteUnsubmitted Done Inline Actions I assume the short uncommented list here was just for testing? emaste: I assume the short uncommented list here was just for testing?
				converters/base64
				devel/py-oci
				devel/py-babel
				devel/py-iso8601
				devel/py-pbr
				devel/py-six
				ftp/curl
				lang/python
				lang/python3
				net/cloud-init
				net/py-eventlet
				net/py-netaddr
				net/py-netifaces
				net/py-oauth
				net/rsync
				panicmail
				security/ca_root_nss
				security/sudo
				sysutils/firstboot-freebsd-update
				sysutils/firstboot-pkgs
				sysutils/panicmail
				textproc/jq
				"

				# Should be enough for base image, image can be resized in needed
				export VMSIZE=5g

				# Set to a list of third-party software to enable in rc.conf(5).
				export VM_RC_LIST="
				cloudinit
				firstboot_pkgs
				firstboot_freebsd_update
				growfs
				ntpd
				ntpd_sync_on_start
				sshd
				zfs"

				vm_extra_pre_umount() {
				cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf
				dumpdev=AUTO
				sendmail_enable=NONE
				kldlist="${kldlist} virtio_random virtio_console virtio_balloon"
				EOF

				cat <<-'EOF' >> ${DESTDIR}/boot/loader.conf
				autoboot_delay="5"
				beastie_disable="YES"
				boot_serial="YES"
				loader_logo="none"
				# storage
				cryptodev_load="YES"
				opensolaris_load="YES"
				xz_load="YES"
				zfs_load="YES"
				EOF

				cat <<-'EOF' >> ${DESTDIR}/etc/ssh/sshd_config
				emasteUnsubmitted Done Inline Actions we definitely don't want to commit with these emaste: we definitely don't want to commit with these
				# S11 Configure the SSH service to prevent password-based login
				PermitRootLogin prohibit-password
				PasswordAuthentication no
				KbdInteractiveAuthentication no
				PermitEmptyPasswords no
				UseDNS no
				EOF

				# OCI requirements override the default FreeBSD cloud-init settings
				emasteUnsubmitted Done Inline Actions OCI wants `PermitRootLogin no` (S14 in their requirements) emaste: OCI wants `PermitRootLogin no` (S14 in their requirements)
				cat <<-'EOF' >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg
				# S14 Root user login must be disabled.
				disable_root: true
				system_info:
				emasteUnsubmitted Done Inline Actions OCI also suggests `UsePAM no` but we might want to leave PAM enabled; it provides account and session processing for all auth types. emaste: OCI also suggests `UsePAM no` but we might want to leave PAM enabled; it provides account and…
				distro: freebsd
				default_user:
				name: freebsd
				emasteUnsubmitted Done Inline Actions Perhaps `pw -R ${DESTDIR} usermod root -w no` But that said, the cloud-init config currently installs the provided ssh key in /root/.ssh/authorized_keys. emaste: Perhaps `pw -R ${DESTDIR} usermod root -w no` But that said, the cloud-init config currently…
				emasteUnsubmitted Done Inline Actions Perhaps: # S14 Root user login must be disabled. pw -R ${DESTDIR} usermod root -w no cat <<-EOF >> ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_oci.cfg disable_root: true EOF emaste: Perhaps: ``` # S14 Root user login must be disabled. pw -R ${DESTDIR} usermod…
				dchAuthorUnsubmitted Done Inline Actions I think we're ok here with the cloud-init line only. dch: I think we're ok here with the cloud-init line only.
				lock_passwd: True
				gecos: "OCI Default User"
				groups: [wheel]
				sudo: ["ALL=(ALL) NOPASSWD:ALL"]
				shell: /bin/sh
				network:
				renderers: ['freebsd']
				EOF

				# Use Oracle Cloud Infrastructure NTP server
				sed -E -e 's/^pool.*iburst/server 169.254.169.254 iburst/' \
				${DESTDIR}/etc/ntp.conf

				touch ${DESTDIR}/firstboot

				return 0
				}