diff options
| author | David Howells <dhowells@redhat.com> | 2014-07-17 20:45:08 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-17 20:45:08 +0100 |
| commit | 0c7774abb41bd00d5836d9ba098825a40fa94133 (patch) | |
| tree | d3c6cb9e81dd798b7383ed47a5fd5499b772a3ea /fs | |
| parent | b6b8a371f5541c2b839caba84fede693f3fcc43d (diff) | |
| download | linux-0c7774abb41bd00d5836d9ba098825a40fa94133.tar.bz2 | |
KEYS: Allow special keys (eg. DNS results) to be invalidated by CAP_SYS_ADMIN
Special kernel keys, such as those used to hold DNS results for AFS, CIFS and
NFS and those used to hold idmapper results for NFS, used to be
'invalidateable' with key_revoke(). However, since the default permissions for
keys were reduced:
Commit: 96b5c8fea6c0861621051290d705ec2e971963f1
KEYS: Reduce initial permissions on keys
it has become impossible to do this.
Add a key flag (KEY_FLAG_ROOT_CAN_INVAL) that will permit a key to be
invalidated by root. This should not be used for system keyrings as the
garbage collector will try and remove any invalidate key. For system keyrings,
KEY_FLAG_ROOT_CAN_CLEAR can be used instead.
After this, from userspace, keyctl_invalidate() and "keyctl invalidate" can be
used by any possessor of CAP_SYS_ADMIN (typically root) to invalidate DNS and
idmapper keys. Invalidated keys are immediately garbage collected and will be
immediately rerequested if needed again.
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/idmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 567983d2c0eb..b7458d77f511 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -282,6 +282,8 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen, desc, "", 0, idmap); mutex_unlock(&idmap->idmap_mutex); } + if (!IS_ERR(rkey)) + set_bit(KEY_FLAG_ROOT_CAN_INVAL, &rkey->flags); kfree(desc); return rkey; |