From a8be09840365e46ea17160aaea1925d34a8432bc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 24 Nov 2021 18:34:02 +0100 Subject: [PATCH] homework: also apply uid shifting when changing passwords/resizing/updating home areas This adds uidmap shifting also when resizing/updating/changing passwords. Prviously I thought we didn't have to, because the user is not going to access the uidmap if we only quickly activate the home area. But this thinking is wrong, because the three operations will result in an update ~/.identity fie to be written, and we should do that with uidmap applied, so that its ownership maps down to nobody below as intended. Fixes: #21441 --- src/home/homework-luks.c | 4 ++++ src/home/homework.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 2e1c4c61701..29a18b48d96 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -3202,6 +3202,10 @@ int home_resize_luks( return r; } + r = home_maybe_shift_uid(h, flags, setup); + if (r < 0) + return r; + log_info("offset = %" PRIu64 ", size = %" PRIu64 ", image = %" PRIu64, setup->partition_offset, setup->partition_size, old_image_size); if ((UINT64_MAX - setup->partition_offset) < setup->partition_size || diff --git a/src/home/homework.c b/src/home/homework.c index 864171faedc..d2a24d32100 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -1609,6 +1609,10 @@ static int home_update(UserRecord *h, UserRecord **ret) { if (r < 0) return r; + r = home_maybe_shift_uid(h, flags, &setup); + if (r < 0) + return r; + r = home_store_header_identity_luks(new_home, &setup, header_home); if (r < 0) return r; @@ -1701,6 +1705,10 @@ static int home_passwd(UserRecord *h, UserRecord **ret_home) { if (r < 0) return r; + r = home_maybe_shift_uid(h, flags, &setup); + if (r < 0) + return r; + switch (user_record_storage(h)) { case USER_LUKS: -- 2.47.3