diff --git a/btrfs-subvolumes.patch b/btrfs-subvolumes.patch new file mode 100644 index 0000000..8d5275d --- /dev/null +++ b/btrfs-subvolumes.patch @@ -0,0 +1,275 @@ +commit 7561ce4594254480f42be721553dade3126e7a1c +Author: Adam Majer +Date: Mon Jan 21 09:32:36 2019 +0100 + + {WIP} + +diff --git a/lib/prototypes.h b/lib/prototypes.h +index d9e7f6f4..9e4f73cd 100644 +--- a/lib/prototypes.h ++++ b/lib/prototypes.h +@@ -72,6 +72,12 @@ extern int expire (const struct passwd *, /*@null@*/const struct spwd *); + /* isexpired.c */ + extern int isexpired (const struct passwd *, /*@null@*/const struct spwd *); + ++/* btrfs.c */ ++extern int btrfs_create_subvolume(const char *path); ++extern int btrfs_remove_subvolume(const char *path); ++extern int btrfs_is_subvolume(const char *path); ++extern int is_btrfs(const char *path); ++ + /* basename() renamed to Basename() to avoid libc name space confusion */ + /* basename.c */ + extern /*@observer@*/const char *Basename (const char *str); +diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am +index eb44a569..a95392ea 100644 +--- a/libmisc/Makefile.am ++++ b/libmisc/Makefile.am +@@ -10,6 +10,7 @@ libmisc_a_SOURCES = \ + age.c \ + audit_help.c \ + basename.c \ ++ btrfs.c \ + chkname.c \ + chkname.h \ + chowndir.c \ +diff --git a/libmisc/btrfs.c b/libmisc/btrfs.c +new file mode 100644 +index 00000000..7236454a +--- /dev/null ++++ b/libmisc/btrfs.c +@@ -0,0 +1,94 @@ ++#include ++#include ++#include ++ ++#include "prototypes.h" ++ ++ ++static int run_btrfs_subvolume_cmd(const char *subcmd, const char *arg1, const char *arg2) ++{ ++ int status = 0; ++ const char *cmd = "/sbin/btrfs"; ++ const char *argv[] = { ++ strrchr(cmd, '/'), ++ "subvolume", ++ subcmd, ++ arg1, ++ arg2, ++ NULL ++ }; ++ ++ if (argv[0] == NULL) ++ argv[0] = cmd; ++ else ++ argv[0] = argv[0] + 1; ++ ++ if (access(cmd, X_OK)) { ++ return 1; ++ } ++ ++ if (run_command(cmd, argv, NULL, &status)) ++ return -1; ++ return status; ++} ++ ++ ++int btrfs_create_subvolume(const char *path) ++{ ++ return run_btrfs_subvolume_cmd("create", path, NULL); ++} ++ ++ ++int btrfs_remove_subvolume(const char *path) ++{ ++ return run_btrfs_subvolume_cmd("delete", "-C", path); ++} ++ ++ ++/* Adapted from btrfsprogs */ ++/* ++ * This intentionally duplicates btrfs_util_is_subvolume_fd() instead of opening ++ * a file descriptor and calling it, because fstat() and fstatfs() don't accept ++ * file descriptors opened with O_PATH on old kernels (before v3.6 and before ++ * v3.12, respectively), but stat() and statfs() can be called on a path that ++ * the user doesn't have read or write permissions to. ++ * ++ * returns: ++ * 1 - btrfs subvolume ++ * 0 - not btrfs subvolume ++ * -1 - error ++ */ ++int btrfs_is_subvolume(const char *path) ++{ ++ struct stat st; ++ int ret; ++ ++ ret = is_btrfs(path); ++ if (ret <= 0) ++ return ret; ++ ++ ret = stat(path, &st); ++ if (ret == -1) ++ return -1; ++ ++ if (st.st_ino != BTRFS_FIRST_FREE_OBJECTID || !S_ISDIR(st.st_mode)) { ++ return 0; ++ } ++ ++ return 1; ++} ++ ++ ++/* Adapted from btrfsprogs */ ++int is_btrfs(const char *path) ++{ ++ struct statfs sfs; ++ int ret; ++ ++ ret = statfs(path, &sfs); ++ if (ret == -1) ++ return -1; ++ ++ return sfs.f_type == BTRFS_SUPER_MAGIC; ++} ++ +diff --git a/src/useradd.c b/src/useradd.c +index 41e2ace4..db6d6998 100644 +--- a/src/useradd.c ++++ b/src/useradd.c +@@ -68,6 +68,7 @@ + #include "sgroupio.h" + #endif + #include "shadowio.h" ++#include "spawn.h" + #ifdef ENABLE_SUBIDS + #include "subordinateio.h" + #endif /* ENABLE_SUBIDS */ +@@ -165,6 +166,7 @@ static bool + oflg = false, /* permit non-unique user ID to be specified with -u */ + rflg = false, /* create a system account */ + sflg = false, /* shell program for new account */ ++ subvolflg = false, /* create subvolume home on BTRFS */ + uflg = false, /* specify user ID for new account */ + Uflg = false; /* create a group having the same name as the user */ + +@@ -822,6 +824,7 @@ static void usage (int status) + Prog, Prog, Prog); + (void) fputs (_(" -b, --base-dir BASE_DIR base directory for the home directory of the\n" + " new account\n"), usageout); ++ (void) fputs (_(" --btrfs-subvolume-home use BTRFS subvolume for home directory\n"), usageout); + (void) fputs (_(" -c, --comment COMMENT GECOS field of the new account\n"), usageout); + (void) fputs (_(" -d, --home-dir HOME_DIR home directory of the new account\n"), usageout); + (void) fputs (_(" -D, --defaults print or change default useradd configuration\n"), usageout); +@@ -1102,6 +1105,7 @@ static void process_flags (int argc, char **argv) + int c; + static struct option long_options[] = { + {"base-dir", required_argument, NULL, 'b'}, ++ {"btrfs-subvolume-home", no_argument, NULL, 200}, + {"comment", required_argument, NULL, 'c'}, + {"home-dir", required_argument, NULL, 'd'}, + {"defaults", no_argument, NULL, 'D'}, +@@ -1131,9 +1135,9 @@ static void process_flags (int argc, char **argv) + }; + while ((c = getopt_long (argc, argv, + #ifdef WITH_SELINUX +- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", ++ "b::c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", + #else /* !WITH_SELINUX */ +- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U", ++ "b::c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U", + #endif /* !WITH_SELINUX */ + long_options, NULL)) != -1) { + switch (c) { +@@ -1148,6 +1152,9 @@ static void process_flags (int argc, char **argv) + def_home = optarg; + bflg = true; + break; ++ case 200: ++ subvolflg = true; ++ break; + case 'c': + if (!VALID (optarg)) { + fprintf (stderr, +@@ -2073,7 +2080,35 @@ static void create_home (void) + strcat (path, "/"); + strcat (path, cp); + if (access (path, F_OK) != 0) { +- if (mkdir (path, 0) != 0) { ++ /* Check if parent directory is BTRFS, fail if requesting ++ subvolume but no BTRFS. The paths cound be different by the ++ trailing slash ++ */ ++ if (subvolflg && (strlen(prefix_user_home) - (int)strlen(path)) <= 1) { ++ char *btrfs_check = strdup(path); ++ ++ if (!btrfs_check) { ++ fprintf (stderr, ++ _("%s: error while duplicating string in BTRFS check %s\n"), ++ Prog, path); ++ fail_exit (E_HOMEDIR); ++ } ++ btrfs_check[strlen(path) - strlen(cp) - 1] = '\0'; ++ if (is_btrfs(btrfs_check) <= 0) { ++ fprintf (stderr, ++ _("%s: home directory \"%s\" must be mounted on BTRFS\n"), ++ Prog, path); ++ fail_exit (E_HOMEDIR); ++ } ++ // make subvolume to mount for user instead of directory ++ if (btrfs_create_subvolume(path)) { ++ fprintf (stderr, ++ _("%s: failed to create BTRFS subvolume: %s\n"), ++ Prog, path); ++ fail_exit (E_HOMEDIR); ++ } ++ } ++ else if (mkdir (path, 0) != 0) { + fprintf (stderr, + _("%s: cannot create directory %s\n"), + Prog, path); +diff --git a/src/userdel.c b/src/userdel.c +index 0715e4fe..00369133 100644 +--- a/src/userdel.c ++++ b/src/userdel.c +@@ -1272,7 +1272,21 @@ int main (int argc, char **argv) + #endif /* EXTRA_CHECK_HOME_DIR */ + + if (rflg) { +- if (remove_tree (user_home, true) != 0) { ++ int is_subvolume = btrfs_is_subvolume (user_home); ++ if (is_subvolume < 0) { ++ errors++; ++ /* continue */ ++ } ++ else if (is_subvolume > 0) { ++ if (btrfs_remove_subvolume (user_home)) { ++ fprintf (stderr, ++ _("%s: error removing subvolume %s\n"), ++ Prog, user_home); ++ errors++; ++ /* continue */ ++ } ++ } ++ else if (remove_tree (user_home, true) != 0) { + fprintf (stderr, + _("%s: error removing directory %s\n"), + Prog, user_home); +diff --git a/src/usermod.c b/src/usermod.c +index 72eeb8b2..427bb718 100644 +--- a/src/usermod.c ++++ b/src/usermod.c +@@ -1819,6 +1819,13 @@ static void move_home (void) + return; + } else { + if (EXDEV == errno) { ++ if (btrfs_is_subvolume (prefix_user_home) > 0) { ++ fprintf (stderr, ++ _("%s: error: cannot move subvolume from %s to %s - different device\n"), ++ Prog, prefix_user_home, prefix_user_newhome); ++ fail_exit (E_HOMEDIR); ++ } ++ + if (copy_tree (prefix_user_home, prefix_user_newhome, true, + true, + user_id, diff --git a/shadow.changes b/shadow.changes index ee0beed..c1f03f0 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 23 09:35:01 UTC 2019 - adam.majer@suse.de + +- btrfs-subvolumes.patch: implement support for creating user home + directories on btrfs subvolumes (fate#316134) + ------------------------------------------------------------------- Wed Oct 31 14:17:29 UTC 2018 - Valentin Rothberg diff --git a/shadow.spec b/shadow.spec index b6b0027..1299cdd 100644 --- a/shadow.spec +++ b/shadow.spec @@ -1,7 +1,7 @@ # # spec file for package shadow # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -45,6 +45,7 @@ Patch10: encryption_method_nis.patch Patch11: useradd-mkdirs.patch Patch12: shadow-4.6.0-fix-usermod-prefix-crash.patch Patch20: disable_new_audit_function.patch +Patch21: btrfs-subvolumes.patch BuildRequires: audit-devel > 2.3 BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -79,6 +80,7 @@ group accounts. %patch12 -p1 %if 0%{?suse_version} < 1330 %patch20 -p1 +%patch21 -p1 %endif iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8