diff options
| author |   David Howells <dhowells@redhat.com> | 2014-07-22 21:55:45 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-22 21:55:45 +0100 |
| commit | 633706a2ee81637be37b6bc02c5336950cc163b5 (patch) | |
| tree | 5dad64c393d3b12276b35c5835c40c6d78f606a2 /fs | |
| parent | Merge remote-tracking branch 'integrity/next-with-keys' into keys-next (diff) | |
| parent | digsig: make crypto builtin if digsig selected as builtin (diff) | |
| download | linux-dev-633706a2ee81637be37b6bc02c5336950cc163b5.tar.xz linux-dev-633706a2ee81637be37b6bc02c5336950cc163b5.zip | |
Merge branch 'keys-fixes' into keys-next
Signed-off-by: David Howells <dhowells@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 59b217a3266d..7dd55b745c4d 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -284,6 +284,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; |