Commit f28687a
committed
use uniform permission checks for all mount propagation changes
jira VULN-98609
cve-bf CVE-2025-38498
commit-author Al Viro <viro@zeniv.linux.org.uk>
commit cffd044
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: Brett Mastbergen <bmastbergen@ciq.com>1 parent d6f47bc commit f28687a
1 file changed
+20
-14
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2287 | 2287 | | |
2288 | 2288 | | |
2289 | 2289 | | |
| 2290 | + | |
| 2291 | + | |
| 2292 | + | |
| 2293 | + | |
| 2294 | + | |
| 2295 | + | |
| 2296 | + | |
| 2297 | + | |
| 2298 | + | |
| 2299 | + | |
| 2300 | + | |
| 2301 | + | |
| 2302 | + | |
2290 | 2303 | | |
2291 | 2304 | | |
2292 | 2305 | | |
| |||
2323 | 2336 | | |
2324 | 2337 | | |
2325 | 2338 | | |
2326 | | - | |
2327 | | - | |
| 2339 | + | |
| 2340 | + | |
2328 | 2341 | | |
2329 | | - | |
| 2342 | + | |
2330 | 2343 | | |
2331 | 2344 | | |
2332 | 2345 | | |
| |||
2709 | 2722 | | |
2710 | 2723 | | |
2711 | 2724 | | |
2712 | | - | |
2713 | | - | |
2714 | | - | |
2715 | | - | |
2716 | | - | |
2717 | | - | |
2718 | | - | |
2719 | | - | |
2720 | | - | |
2721 | | - | |
| 2725 | + | |
| 2726 | + | |
2722 | 2727 | | |
2723 | | - | |
| 2728 | + | |
| 2729 | + | |
2724 | 2730 | | |
2725 | 2731 | | |
2726 | 2732 | | |
| |||
0 commit comments