diff options
| author | David Howells <dhowells@redhat.com> | 2014-07-22 16:55:45 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-22 16:55:45 -0400 |
| commit | 633706a2ee81637be37b6bc02c5336950cc163b5 (patch) | |
| tree | 5dad64c393d3b12276b35c5835c40c6d78f606a2 /net/dns_resolver | |
| parent | 64724cfc6eea920dbaada14f0fb978b1dd31192d (diff) | |
| parent | 0d1f64f60b4c50a8c604010ad3eef5cdfe9926bc (diff) | |
Merge branch 'keys-fixes' into keys-next
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/dns_resolver')
| -rw-r--r-- | net/dns_resolver/dns_query.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c index 9acec61f5433..9a32f55cf9b9 100644 --- a/net/dns_resolver/dns_query.c +++ b/net/dns_resolver/dns_query.c | |||
| @@ -129,6 +129,7 @@ int dns_query(const char *type, const char *name, size_t namelen, | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | down_read(&rkey->sem); | 131 | down_read(&rkey->sem); |
| 132 | set_bit(KEY_FLAG_ROOT_CAN_INVAL, &rkey->flags); | ||
| 132 | rkey->perm |= KEY_USR_VIEW; | 133 | rkey->perm |= KEY_USR_VIEW; |
| 133 | 134 | ||
| 134 | ret = key_validate(rkey); | 135 | ret = key_validate(rkey); |