Commit 106adb1
committed
use uniform permission checks for all mount propagation changes
jira VULN-98606
jira VULN-98607
cve-bf CVE-2025-38498
commit-author Al Viro <viro@zeniv.linux.org.uk>
commit cffd044
upstream-diff This is a partial backport due to missing 9ffb14e
which introduces do_set_group(). This is where the below
operation on diffferent aspects of the same thing is introduced.
This change does however introduce some additional safety checks
which should be considered.
do_change_type() and do_set_group() are operating on different
aspects of the same thing - propagation graph. The latter
asks for mounts involved to be mounted in namespace(s) the caller
has CAP_SYS_ADMIN for. The former is a mess - originally it
didn't even check that mount *is* mounted. That got fixed,
but the resulting check turns out to be too strict for userland -
in effect, we check that mount is in our namespace, having already
checked that we have CAP_SYS_ADMIN there.
What we really need (in both cases) is
* only touch mounts that are mounted. That's a must-have
constraint - data corruption happens if it get violated.
* don't allow to mess with a namespace unless you already
have enough permissions to do so (i.e. CAP_SYS_ADMIN in its userns).
That's an equivalent of what do_set_group() does; let's extract that
into a helper (may_change_propagation()) and use it in both
do_set_group() and do_change_type().
Fixes: 12f147d "do_change_type(): refuse to operate on unmounted/not ours mounts"
Acked-by: Andrei Vagin <avagin@gmail.com>
Reviewed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Tested-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit cffd044)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>1 parent 6436952 commit 106adb1
1 file changed
+16
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2254 | 2254 | | |
2255 | 2255 | | |
2256 | 2256 | | |
| 2257 | + | |
| 2258 | + | |
| 2259 | + | |
| 2260 | + | |
| 2261 | + | |
| 2262 | + | |
| 2263 | + | |
| 2264 | + | |
| 2265 | + | |
| 2266 | + | |
| 2267 | + | |
| 2268 | + | |
| 2269 | + | |
2257 | 2270 | | |
2258 | 2271 | | |
2259 | 2272 | | |
| |||
2290 | 2303 | | |
2291 | 2304 | | |
2292 | 2305 | | |
2293 | | - | |
2294 | | - | |
| 2306 | + | |
| 2307 | + | |
2295 | 2308 | | |
2296 | | - | |
| 2309 | + | |
2297 | 2310 | | |
2298 | 2311 | | |
2299 | 2312 | | |
| |||
0 commit comments