Skip to content

Fixed LoadMountInfo() leaving its timeout armed on early returns - #86

Open
djbclark wants to merge 47 commits into
masterfrom
fix/mount-options-timeout-leak-r4
Open

djbclark wants to merge 47 commits into
masterfrom
fix/mount-options-timeout-leak-r4

Conversation

@djbclark

@djbclark djbclark commented Nov 1, 2026

Copy link
Copy Markdown
Owner

LoadMountInfo() arms an RPCTIMEOUT (60 s) alarm before running the mount command but returned without disarming it when it could not open the command, when it failed to read its output, and when the output mentioned an RPC failure, so the alarm expired later and terminated whichever child was running. All three early returns now call DisarmTimeOut(). Two tests in tests/unit/nfs_test.c make the last two returns real, with /bin/sh and a script from stdin in place of mount (the command of the Windows NT class, cut at its first space as LoadMountInfo() does; the test comment says it relies on that row): one prints a line containing "RPC", the other signals the test once ps shows it blocked in the read, which fails with EINTR. Neither uses a libc override or a real mount, so both run on macOS. The open-failure return has no test, as it cannot be provoked without an override. Stacked on fix/exec-timeout-prefork-race-r3 (#84), which provides DisarmTimeOut(). On head 9a0b5e3 make -C tests/unit check passes 79 of 79 programs on Linux (Ubuntu 24.04 aarch64, --enable-debug), and nfs_test passes 7 of 7 there and on macOS arm64. With cf-agent/nfs.c reverted to #84's head, nfs_test fails at nfs_test.c:228 (RPC) and :265 (read error) on Linux and macOS; reverted to this branch's predecessor 2ef6d10 it fails at :228 only.

Refs #16

Adversary review (omp Claude Opus 5.5, read-only; the r2 and r3 heads were BLOCKed, this rework checked finding by finding): APPROVE, no P0-P2. P3 notes: the test's ps poll is not bounded below RPCTIMEOUT, so on a host without a usable ps (a minimal container) it fails after about 60 s instead of signalling anyway (#85); the open-failure return still has no test; the branch name describes #16, not this change.

🤖 Generated with Claude Code

victormlg and others added 30 commits October 28, 2026 12:55
Added the reactor tests to jenkins, to be able to run them in jenkins. This
means we can test cf-reactor on all the different platforms.

Signed-off-by: Victor Moene <victor.moene@northern.tech>
Made the logs prettier and added a log file where the xtrace is
printed

Signed-off-by: Victor Moene <victor.moene@northern.tech>
The guest environment cannot contain "-". On hosts containing "-", the
promise fails. The host name is now canonofied.

Signed-off-by: Victor Moene <victor.moene@northern.tech>
X509_get_subject_name() now returns a const name. Build a new
X509_NAME and set it as both subject and issuer instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Tests that print Pass message but have logs errors will fail with `FAIL (Error printed)` message.
Tests which are expected to log errors should use `.error.cf` or `.error.pass.cf` suffix. see: `tests/acceptance/README`

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
These tests read files created by their own init bundle, but pre-evaluation calls the read functions before the files exist, logging "Could not examine file" errors which now fail regular tests.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Errors printed by the command were reported on lines starting with "error:", so testall mistook them for errors of the test itself.

Ticket: CFE-3041

Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
These tests read files and directories created by their own policy, but pre-evaluation calls the functions before they exist, logging errors which now fail regular tests.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
The agent loads def.json from the directory of the input policy file, so tests in 00_basics/ tried to read this directory as their augments file and logged "Could not open JSON file" errors.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
The test used the 'immediate' body from plucked.sub.cf before it was
loaded during pre-evaluation, so the promise is now skipped until the
test framework is loaded.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
The test referred to a promise module which never existed and did not run its init and cleanup bundles.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
The check bundle counted lines in files which do not exist until the test bundle has run, but the agent evaluates the functions of all promises before any bundle runs.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
wrong-bundle-type.cf printed the sub-agent output in its DEBUG report, so the sub-agent errors were mistaken for errors of the test, and ifelse.cf used invalid class expressions as false conditions.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
These tests intentionally exercise error paths, the reason is documented in the header of each test.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Ticket: CFE-3041
Signed-off-by: Nick Anderson <nick@cmdln.org>
Ticket: CFE-3041
Signed-off-by: Nick Anderson <nick@cmdln.org>
The errorpass branch only checked for logged errors and the Pass
message, so a test marked test_soft_fail or test_skip_unsupported was
reported as FAIL (e.g. process_select_fncalls.error.pass.cf on Windows,
which soft fails due to ENT-10217 and logs no errors there). Errorpass
tests now go through the regular outcome handling and only differ in
requiring at least one logged error on Pass.
Ticket: CFE-3041
Signed-off-by: Nick Anderson <nick@cmdln.org>
Signed-off-by: Dhanraj E <dhanraj@labs.digiscrypt.com>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
…ptions() public

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
The test promised the current user with policy "present" and expected
the promise to be kept. For an existing user, "present" also means
"not locked". When run as root, cf-reactor can read /etc/shadow, and if
the account's password hash starts with '!' (as root's does on some
systems), it is considered locked and gets unlocked. The promise was
then repaired instead of kept, and the test modified the root account.
As a normal user, /etc/shadow is unreadable, so the account was
considered unlocked and the test passed.

Instead, we modify the policy to always return "kept"

Signed-off-by: Victor Moene <victor.moene@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
larsewi and others added 17 commits October 29, 2026 13:05
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
…be created

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
…per.c

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
ENT-14766: Prepared cf-reactor event types for package events
ENT-14766: Moved package module wrapper from cf-agent to libpromises
Ticket: ENT-14765
Changelog: `cf-reactor` can now react to a user being added or removed, with the `user_added` and `user_removed` attributes of `when` bodies
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
CFE-3041: Made testall fail regular acceptance tests which log errors
…Jenkins

Added reactor tests to make check
ENT-14765: cf-reactor: Added user_added and user_removed events
…-path-overflow

fix stack buffer overflow in SaveAsFile backup path construction
SetTimeOut() armed the alarm at once, but cf_popen() publishes the pid of
the child in ALARM_PID only after fork(). If the alarm expired in between,
for example because the agent was stalled by a heavily loaded host,
TimeOut() found nothing to terminate and the command then ran without
any limit.

The new SetChildTimeOut() only records the timeout and cf_popen*() starts
the clock right after publishing the pid; RepairExec() and the mount
commands in nfs.c use it. SetTimeOut() still arms at once, for callers
that do not fork. A request is good for one cf_popen*() call, and the new
DisarmTimeOut() drops it, so an abandoned request cannot start the clock
for an unrelated child.

Changelog: Title
Ticket: none
Signed-off-by: Daniel JB Clark <djbclark@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
LoadMountInfo() arms an RPCTIMEOUT alarm before running the mount command
but returned without disarming it when it could not open the command, when
it failed to read its output, or when the output reported an RPC failure.
The alarm then expired later and terminated whichever child happened to be
running. All three early returns now call DisarmTimeOut().

Changelog: Title
Ticket: none
Signed-off-by: Daniel JB Clark <djbclark@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 1, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-01T20:34:33.204401Z 9a0b5e3 PR opened
🔒 Security Review ✅ Completed 2026-11-01T20:36:19.171886Z 9a0b5e3 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants