diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/local.mk | 1 | ||||
| -rw-r--r-- | src/ls.c | 41 |
4 files changed, 36 insertions, 9 deletions
@@ -26,6 +26,7 @@ Pádraig Brady <p@draigBrady.com> <P@draigBrady.com> <psfales@alcatel-lucent.com> <psfales@lucent.com> <karl@gnu.org> <karl@freefriends.org> <stephane.raimbault@gmail.com> <stephane.raimbault@makina-corpus.com> +<jarkko.sakkinen@iki.fi> <jarkko.sakkinen@linux.intel.com> # Prefer spelled-out middle name and its address. Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no> @@ -29,7 +29,7 @@ GNU coreutils NEWS -*- outline -*- ** New features - id -Z reports the SMACK security context where available. + ls -Z and id -Z report the SMACK security context where available. join accepts a new option: --zero-terminated (-z). As with the sort,uniq option of the same name, this makes join consume and produce NUL-terminated diff --git a/src/local.mk b/src/local.mk index efb003880..626d580de 100644 --- a/src/local.mk +++ b/src/local.mk @@ -230,6 +230,7 @@ src_ginstall_LDADD += $(LIB_SELINUX) src_id_LDADD += $(LIB_SELINUX) src_id_LDADD += $(LIB_SMACK) src_ls_LDADD += $(LIB_SELINUX) +src_ls_LDADD += $(LIB_SMACK) src_mkdir_LDADD += $(LIB_SELINUX) src_mkfifo_LDADD += $(LIB_SELINUX) src_mknod_LDADD += $(LIB_SELINUX) @@ -115,6 +115,10 @@ # include <sys/capability.h> #endif +#ifdef HAVE_SMACK +# include <sys/smack.h> +#endif + #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) @@ -2757,7 +2761,14 @@ free_ent (struct fileinfo *f) free (f->name); free (f->linkname); if (f->scontext != UNKNOWN_SECURITY_CONTEXT) - freecon (f->scontext); + { +#ifdef HAVE_SMACK + if (smack_smackfs_path ()) + free (f->scontext); + else +#endif + freecon (f->scontext); + } } /* Empty the table of files. */ @@ -2812,9 +2823,16 @@ getfilecon_cache (char const *file, struct fileinfo *f, bool deref) errno = ENOTSUP; return -1; } - int r = (deref - ? getfilecon (file, &f->scontext) - : lgetfilecon (file, &f->scontext)); + int r = 0; +#ifdef HAVE_SMACK + if (smack_smackfs_path ()) + r = smack_new_label_from_path (file, "security.SMACK64", deref, + &f->scontext); + else +#endif + r = (deref + ? getfilecon (file, &f->scontext) + : lgetfilecon (file, &f->scontext)); if (r < 0 && errno_unsupported (errno)) unsupported_device = f->stat.st_dev; return r; @@ -3005,13 +3023,20 @@ gobble_file (char const *name, enum filetype type, ino_t inode, if (format == long_format || print_scontext) { - bool have_selinux = false; + bool have_scontext = false; bool have_acl = false; int attr_len = getfilecon_cache (absolute_name, f, do_deref); err = (attr_len < 0); if (err == 0) - have_selinux = ! STREQ ("unlabeled", f->scontext); + { +#ifdef HAVE_SMACK + if (smack_smackfs_path ()) + have_scontext = ! STREQ ("_", f->scontext); + else +#endif + have_scontext = ! STREQ ("unlabeled", f->scontext); + } else { f->scontext = UNKNOWN_SECURITY_CONTEXT; @@ -3031,9 +3056,9 @@ gobble_file (char const *name, enum filetype type, ino_t inode, have_acl = (0 < n); } - f->acl_type = (!have_selinux && !have_acl + f->acl_type = (!have_scontext && !have_acl ? ACL_T_NONE - : (have_selinux && !have_acl + : (have_scontext && !have_acl ? ACL_T_SELINUX_ONLY : ACL_T_YES)); any_has_acl |= f->acl_type != ACL_T_NONE; |