summaryrefslogtreecommitdiffstats
path: root/net/dns_resolver
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-07-22 22:55:45 +0200
committerDavid Howells <dhowells@redhat.com>2014-07-22 22:55:45 +0200
commit633706a2ee81637be37b6bc02c5336950cc163b5 (patch)
tree5dad64c393d3b12276b35c5835c40c6d78f606a2 /net/dns_resolver
parentMerge remote-tracking branch 'integrity/next-with-keys' into keys-next (diff)
parentdigsig: make crypto builtin if digsig selected as builtin (diff)
downloadlinux-633706a2ee81637be37b6bc02c5336950cc163b5.tar.xz
linux-633706a2ee81637be37b6bc02c5336950cc163b5.zip
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.c1
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,
}
down_read(&rkey->sem);
+ set_bit(KEY_FLAG_ROOT_CAN_INVAL, &rkey->flags);
rkey->perm |= KEY_USR_VIEW;
ret = key_validate(rkey);