Fixup largefile define #31419

AdrianVovk · 2024-02-20T19:57:55Z

Also makes the error messages include the flags that are invalid, for easier debugging in the future, and defines a macro that declares what flags are safe to use (since there's > 1 consumer of this nowadays, and more coming with #26826)

This value is actually arch-specific, so this commit defines it for all the arches that set it to some custom value Fixes systemd#31417

Adds a SAFE_FD_FLAGS define to list out all the safe FD flags, and also an UNSAFE_FD_FLAGS() macro to strip out the safe flags and leave only the unsafe flags. This can be used to quickly check if any unsafe flags are set and print them for diagnostic purposes

mrc0mmand · 2024-02-20T21:20:38Z

I tried this on both ppc64le and aarch64 and the issue seems to be indeed gone, thanks!

Also, just out of curiosity, I tried this on armv7l as well, but there the test doesn't get far:

[1216026.467820] testsuite-46.sh[61]: + mount -t tmpfs tmpfs /home -o size=290M
[1216026.481155] testsuite-46.sh[61]: + NEWPASSWORD=xEhErW0ndafV4s
[1216026.481155] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms
[1216026.486666] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=23 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.488123] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=24 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.489369] systemd[1]: home.mount: Changed dead -> mounted
[1216026.491048] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=25 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.492273] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=26 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.493456] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/swap_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=27 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.494637] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/umount_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=28 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.495790] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/local_2dfs_2dpre_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=29 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.496956] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/local_2dfs_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=30 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216027.126558] systemd-homed[53]: Got message type=method_call sender=:1.5 destination=org.freedesktop.home1 path=/org/freedesktop/home1 interface=org.freedesktop.home1.Manager member=CreateHomeEx  cookie=2 reply_cookie=0 signature=sa{sh}t error-name=n/a error-message=n/a
[1216027.128567] systemd-homed[53]: Sent message type=error sender=n/a destination=:1.5 path=n/a interface=n/a member=n/a cookie=5 reply_cookie=2 signature=s error-name=org.freedesktop.DBus.Error.NotSupported error-message=Provided flags are unsupported.
[1216027.130249] systemd-homed[53]: Failed to process message type=method_call sender=:1.5 destination=org.freedesktop.home1 path=/org/freedesktop/home1 interface=org.freedesktop.home1.Manager member=CreateHomeEx cookie=2 reply_cookie=0 signature=sa{sh}t error-name=n/a error-message=n/a: Provided flags are unsupported.
[1216027.131788] homectl[66]: Operation on home test-user failed: Provided flags are unsupported.

Otherwise weird stuff happens on the other side: [1217111.957263] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms [1217112.598219] homectl[66]: Operation on home test-user failed: Provided flags are unsupported (0ad2578000000000). (taken from TEST-46-HOME run on armv7l) Fixes issue mentioned in systemd#31419 (comment).

mrc0mmand · 2024-02-20T21:50:21Z

Also, just out of curiosity, I tried this on armv7l as well, but there the test doesn't get far:

[1216026.467820] testsuite-46.sh[61]: + mount -t tmpfs tmpfs /home -o size=290M
[1216026.481155] testsuite-46.sh[61]: + NEWPASSWORD=xEhErW0ndafV4s
[1216026.481155] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms
[1216026.486666] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=23 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.488123] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=24 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.489369] systemd[1]: home.mount: Changed dead -> mounted
[1216026.491048] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=25 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.492273] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/home_2emount interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=26 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.493456] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/swap_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=27 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.494637] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/umount_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=28 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.495790] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/local_2dfs_2dpre_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=29 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216026.496956] systemd[1]: Sent message type=signal sender=n/a destination=n/a path=/org/freedesktop/systemd1/unit/local_2dfs_2etarget interface=org.freedesktop.DBus.Properties member=PropertiesChanged cookie=30 reply_cookie=0 signature=sa{sv}as error-name=n/a error-message=n/a
[1216027.126558] systemd-homed[53]: Got message type=method_call sender=:1.5 destination=org.freedesktop.home1 path=/org/freedesktop/home1 interface=org.freedesktop.home1.Manager member=CreateHomeEx  cookie=2 reply_cookie=0 signature=sa{sh}t error-name=n/a error-message=n/a
[1216027.128567] systemd-homed[53]: Sent message type=error sender=n/a destination=:1.5 path=n/a interface=n/a member=n/a cookie=5 reply_cookie=2 signature=s error-name=org.freedesktop.DBus.Error.NotSupported error-message=Provided flags are unsupported.
[1216027.130249] systemd-homed[53]: Failed to process message type=method_call sender=:1.5 destination=org.freedesktop.home1 path=/org/freedesktop/home1 interface=org.freedesktop.home1.Manager member=CreateHomeEx cookie=2 reply_cookie=0 signature=sa{sh}t error-name=n/a error-message=n/a: Provided flags are unsupported.
[1216027.131788] homectl[66]: Operation on home test-user failed: Provided flags are unsupported.

-> #31420

Otherwise weird stuff happens on the other side: [1217111.957263] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms [1217112.598219] homectl[66]: Operation on home test-user failed: Provided flags are unsupported (0ad2578000000000). (taken from TEST-46-HOME run on armv7l) Fixes issue mentioned in systemd#31419 (comment).

AdrianVovk · 2024-02-20T22:57:29Z

src/basic/fd-util.h

+ * This ensures that clients can't trick a privileged service into giving access to a file the client
+ * doesn't already have access to (especially via something like O_PATH).
+ *
+ * O_NOFOLLOW: For some reason the kernel will return this flag from fcntl; it doesn't go away immediately


Btw, this is new w/ this PR. Just double checking that this was noticed

YHNdnzj · 2024-02-21T05:12:04Z

src/home/homed-bus.c

-                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "FD for %s has unexpected flags set", filename);
+                if (UNSAFE_FD_FLAGS(flags) != 0)
+                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
+                                                 "FD for %s has unexpected flags set: 0%o",


So I think this is probably too verbose to be included in bus error. We should add a helper that does log_debug internally. But I'll merge this as-is and submit a follow-up.

As per systemd#31419 (comment)

Otherwise weird stuff happens on the other side: [1217111.957263] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms [1217112.598219] homectl[66]: Operation on home test-user failed: Provided flags are unsupported (0ad2578000000000). (taken from TEST-46-HOME run on armv7l) Fixes issue mentioned in #31419 (comment).

As per systemd#31419 (comment)

Otherwise weird stuff happens on the other side: [1217111.957263] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms [1217112.598219] homectl[66]: Operation on home test-user failed: Provided flags are unsupported (0ad2578000000000). (taken from TEST-46-HOME run on armv7l) Fixes issue mentioned in systemd#31419 (comment).

As per systemd#31419 (comment)

Otherwise weird stuff happens on the other side: [1217111.957263] testsuite-46.sh[61]: + homectl create test-user --disk-size=min --luks-discard=yes --image-path=/home/test-user.home --luks-pbkdf-type=pbkdf2 --luks-pbkdf-time-cost=1ms [1217112.598219] homectl[66]: Operation on home test-user failed: Provided flags are unsupported (0ad2578000000000). (taken from TEST-46-HOME run on armv7l) Fixes issue mentioned in systemd#31419 (comment).

As per systemd#31419 (comment)

github-actions bot added journal util-lib please-review PR is ready for (re-)review by a maintainer labels Feb 20, 2024

AdrianVovk mentioned this pull request Feb 20, 2024

unprivileged DDI mounts + dynamic userns range allocation via IPC #26826

Merged

AdrianVovk added 2 commits February 20, 2024 15:01

missing_fcntl: Fix RAW_O_LARGEFILE

9e3db91

This value is actually arch-specific, so this commit defines it for all the arches that set it to some custom value Fixes systemd#31417

AdrianVovk force-pushed the fixup-largefile-define branch from 8381a41 to e4d0606 Compare February 20, 2024 20:01

bluca approved these changes Feb 20, 2024

View reviewed changes

yuwata approved these changes Feb 20, 2024

View reviewed changes

mrc0mmand mentioned this pull request Feb 20, 2024

homectl: make sure we sent the full 8 bytes as flags #31420

Merged

yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed homed homed, homectl, pam_homed and removed please-review PR is ready for (re-)review by a maintainer labels Feb 20, 2024

AdrianVovk commented Feb 20, 2024

View reviewed changes

YHNdnzj reviewed Feb 21, 2024

View reviewed changes

YHNdnzj merged commit e404ca3 into systemd:main Feb 21, 2024
48 of 49 checks passed

github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Feb 21, 2024

YHNdnzj added a commit to YHNdnzj/systemd that referenced this pull request Feb 21, 2024

fd-util: introduce fd_extrinsic_flags_safe

d97d99c

As per systemd#31419 (comment)

YHNdnzj added a commit to YHNdnzj/systemd that referenced this pull request Feb 21, 2024

fd-util: introduce fd_extrinsic_flags_safe

c924f36

As per systemd#31419 (comment)

YHNdnzj added a commit to YHNdnzj/systemd that referenced this pull request Feb 21, 2024

fd-util: introduce fd_verify_safe_flags

1257a1f

As per systemd#31419 (comment)

YHNdnzj added a commit to YHNdnzj/systemd that referenced this pull request Feb 21, 2024

fd-util: introduce fd_verify_safe_flags

43b9752

As per systemd#31419 (comment)

YHNdnzj added a commit to YHNdnzj/systemd that referenced this pull request Feb 21, 2024

fd-util: introduce fd_verify_safe_flags

ef6b1b5

As per systemd#31419 (comment)

AdrianVovk deleted the fixup-largefile-define branch February 21, 2024 19:31

YHNdnzj added a commit to YHNdnzj/systemd that referenced this pull request Feb 21, 2024

fd-util: introduce fd_verify_safe_flags

14f38d1

As per systemd#31419 (comment)

ayhamthemayhem pushed a commit to neighbourhoodie/nh-systemd that referenced this pull request Mar 25, 2024

fd-util: introduce fd_verify_safe_flags

6e6ee59

As per systemd#31419 (comment)

chunyi-wu pushed a commit to chunyi-wu/systemd that referenced this pull request Apr 3, 2024

fd-util: introduce fd_verify_safe_flags

812a82f

As per systemd#31419 (comment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixup largefile define #31419

Fixup largefile define #31419

AdrianVovk commented Feb 20, 2024

mrc0mmand commented Feb 20, 2024

mrc0mmand commented Feb 20, 2024

AdrianVovk Feb 20, 2024

YHNdnzj Feb 21, 2024

Fixup largefile define #31419

Fixup largefile define #31419

Conversation

AdrianVovk commented Feb 20, 2024

mrc0mmand commented Feb 20, 2024

mrc0mmand commented Feb 20, 2024

AdrianVovk Feb 20, 2024

Choose a reason for hiding this comment

YHNdnzj Feb 21, 2024

Choose a reason for hiding this comment