Add linux mlslabel support
The ZFS update to onnv_141 brought with it support for a security label attribute called mlslabel. This feature depends on zones to work correctly and thus I am disabling it under Linux. Equivilant functionality could be added at some point in the future. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
be160928b7
commit
d2c15e84e9
|
@ -904,6 +904,7 @@ zfs_valid_proplist(libzfs_handle_t *hdl, zfs_type_t type, nvlist_t *nvl,
|
|||
|
||||
case ZFS_PROP_MLSLABEL:
|
||||
{
|
||||
#ifdef HAVE_MLSLABEL
|
||||
/*
|
||||
* Verify the mlslabel string and convert to
|
||||
* internal hex label string.
|
||||
|
@ -953,7 +954,12 @@ badlabel:
|
|||
(void) zfs_error(hdl, EZFS_BADPROP, errbuf);
|
||||
m_label_free(new_sl); /* OK if null */
|
||||
goto error;
|
||||
|
||||
#else
|
||||
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
|
||||
"mlslabels are unsupported"));
|
||||
(void) zfs_error(hdl, EZFS_BADPROP, errbuf);
|
||||
goto error;
|
||||
#endif /* HAVE_MLSLABEL */
|
||||
}
|
||||
|
||||
case ZFS_PROP_MOUNTPOINT:
|
||||
|
@ -2041,6 +2047,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
|
|||
|
||||
case ZFS_PROP_MLSLABEL:
|
||||
{
|
||||
#ifdef HAVE_MLSLABEL
|
||||
m_label_t *new_sl = NULL;
|
||||
char *ascii = NULL; /* human readable label */
|
||||
|
||||
|
@ -2074,6 +2081,10 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
|
|||
|
||||
(void) strlcpy(propbuf, ascii, proplen);
|
||||
free(ascii);
|
||||
#else
|
||||
(void) strlcpy(propbuf,
|
||||
getprop_string(zhp, prop, &source), proplen);
|
||||
#endif /* HAVE_MLSLABEL */
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
@ -384,6 +384,7 @@ zfs_secpolicy_write_perms_ds(const char *name, dsl_dataset_t *ds,
|
|||
static int
|
||||
zfs_set_slabel_policy(const char *name, char *strval, cred_t *cr)
|
||||
{
|
||||
#ifdef HAVE_MLSLABEL
|
||||
char ds_hexsl[MAXNAMELEN];
|
||||
bslabel_t ds_sl, new_sl;
|
||||
boolean_t new_default = FALSE;
|
||||
|
@ -471,6 +472,9 @@ out_check:
|
|||
if (needed_priv != -1)
|
||||
return (PRIV_POLICY(cr, needed_priv, B_FALSE, EPERM, NULL));
|
||||
return (0);
|
||||
#else
|
||||
return ENOTSUP;
|
||||
#endif /* HAVE_MLSLABEL */
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in New Issue