Skip to content

Commit 7277040

Browse files
committed
Document sec-patches4
1 parent f47dce8 commit 7277040

3 files changed

Lines changed: 45 additions & 7 deletions

File tree

‎NEWS.md‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
1-
# NEWS for rsync 3.4.1 SECURITY UPDATE (UNRELEASED)
1+
# NEWS for rsync 3.4.1-sec-patches4 (UNRELEASED)
2+
3+
This update corrects regressions and edge cases in the path-confinement
4+
hardening published in `3.4.1-sec-patches3`. It contains no new features or
5+
protocol changes and is validated against the current security regression
6+
suite.
7+
8+
## Corrections in this patch set:
9+
- Directory authority fds use search-only opens where supported, restoring
10+
traversal through directories that are searchable but not readable.
11+
- Operator paths correctly handle `/dev/stdin`, `/dev/stdout`, `/dev/stderr`,
12+
`/dev/fd/N`, process-substitution pipes and user-namespace fd pins without
13+
weakening `--confine-root`.
14+
- FIFO and process-substitution input works again with `--read-batch`.
15+
- `--max-alloc=0` again means the largest limit supported by each peer while
16+
retaining the hardened parser ceiling.
17+
- Restricted `rrsync` paths rooted at `/` are resolved beneath the configured
18+
restricted directory rather than rejected or duplicated.
19+
- Local and remote-shell `--files-from` paths no longer receive the daemon's
20+
module-boundary treatment. Daemon-controlled paths remain confined.
21+
- Explicit sender roots may traverse trusted-owned ancestor symlinks while
22+
recursive scans and file leaves remain confined and race-resistant.
23+
- Alternate-destination leaves no longer follow symlinks and forged
24+
partial-directory state cannot enable in-place output.
25+
- Untrusted-owner symlink refusals now include an actionable diagnostic.
26+
27+
------------------------------------------------------------------------------
28+
# NEWS for rsync 3.4.1-sec-patches3
229

330
This is a security-only update to the 3.4.1 maintenance release. It backports
431
the path-handling and daemon-protocol security fixes from the 3.5.0 audit onto

‎rsync.1.md‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,10 +1333,12 @@ expand it.
13331333

13341334
0. `--confine-root=DIR`
13351335

1336-
This bounds where the paths listed under [`--insecure-links`](#opt) are
1337-
allowed to resolve: one that ends up outside DIR is refused, even if every
1338-
symlink along it was owned by a trusted user. The ownership walk asks who
1339-
planted a link; this asks where the path came out.
1336+
In the default symlink mode this bounds where operator option paths and
1337+
paths selected from a [`--files-from`](#opt) list are allowed to resolve:
1338+
one that ends up outside DIR is refused, even if every symlink along it was
1339+
owned by a trusted user. Explicit source roots remain operator-selected
1340+
transfer roots. The ownership walk asks who planted a link; this asks where
1341+
the path came out.
13401342

13411343
DIR must be absolute. Nothing is confined by default, and
13421344
`--confine-root=/` is a no-op.
@@ -2251,8 +2253,12 @@ expand it.
22512253
See the [`--max-size`](#opt) option for a description of how SIZE can be
22522254
specified. The default suffix if none is given is bytes.
22532255

2254-
Beginning in 3.2.7, a value of 0 is an easy way to specify SIZE_MAX (the
2255-
largest limit possible).
2256+
A value of 0 means the largest limit this build supports. It resolves to
2257+
the same ceiling an explicit SIZE is checked against, so it cannot select
2258+
a limit higher than one that could be written explicitly. The literal 0 is
2259+
passed to the remote rsync, allowing each peer to resolve it for its own
2260+
word size. A daemon administrator can refuse all client-supplied values,
2261+
including 0, with `refuse options = max-alloc`.
22562262

22572263
You can set a default value using the environment variable
22582264
[`RSYNC_MAX_ALLOC`](#) using the same SIZE values as supported by this

‎testsuite/skiplist/backport.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ daemon-refuse-compress-threads-alias # --compress-threads arrived in 3.4.2
2525
daemon-zstd-thread-exhaustion # --compress-threads arrived in 3.4.2
2626
partial_nowrite # receiver chmod-on-denied-open (3.5.0)
2727
partial-protected-regular-retry-policy # EACCES recovery path (3.5.0, macOS-only test)
28+
contimeout-rsh # daemon-over-rsh timeout support (3.5.1)
29+
daemon-stdin-local-socket # local-socket inetd detection (3.5.1)
30+
install-strip # configurable install-strip tool (3.5.1)
31+
rsync-ssl-type-option # flexible rsync-ssl --type placement (3.5.1)
32+
write-touched-blocks # protocol-33 logical-block statistics (3.5.1)
2833

2934
# The suite's per-platform skip lists describe the tests IT ships, so they do
3035
# not describe a build of this branch.

0 commit comments

Comments
 (0)