diff options
| author | Nero | 2023-09-23 11:50:04 +0000 |
|---|---|---|
| committer | Denys Vlasenko | 2023-10-02 14:26:27 +0200 |
| commit | 6d22c9abc29d43e919e819ff004fcd84a90de60b (patch) | |
| tree | 4243be33f0596aa5a70b23067c213de0772b3ee8 /coreutils | |
| parent | 791b222dd55d3aa0e8b09be1be571e4829465dd6 (diff) | |
| download | busybox-6d22c9abc29d43e919e819ff004fcd84a90de60b.zip busybox-6d22c9abc29d43e919e819ff004fcd84a90de60b.tar.gz | |
install: Fix chown resetting suid/sgid bits from chmod
Since Linux 2.2.13, chown(2) resets the suid/gid bits for all users.
This patch changes the ordering so that chmod gets called after chown.
This behavior follows GNU coreutils.
Signed-off-by: Nero <nero@w1r3.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/install.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/coreutils/install.c b/coreutils/install.c index c0f1c53..00f8be8 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -244,6 +244,15 @@ int install_main(int argc, char **argv) } } + /* Set the user and group id */ + /* (must be before chmod, or else chown may clear suid/gid bits) */ + if ((opts & (OPT_OWNER|OPT_GROUP)) + && lchown(dest, uid, gid) == -1 + ) { + bb_perror_msg("can't change %s of %s", "ownership", dest); + ret = EXIT_FAILURE; + } + /* Set the file mode (always, not only with -m). * GNU coreutils 6.10 is not affected by umask. */ if (chmod(dest, mode) == -1) { @@ -254,13 +263,6 @@ int install_main(int argc, char **argv) if (use_default_selinux_context) setdefaultfilecon(dest); #endif - /* Set the user and group id */ - if ((opts & (OPT_OWNER|OPT_GROUP)) - && lchown(dest, uid, gid) == -1 - ) { - bb_perror_msg("can't change %s of %s", "ownership", dest); - ret = EXIT_FAILURE; - } next: if (ENABLE_FEATURE_CLEAN_UP && isdir) free(dest); |