summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-03 15:48:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-03 15:48:01 -0800
commitb65a0e0c84cf489bfa00d6aa6c48abc5a237100f (patch)
tree3ed9d7b094e003a7b0d98234cb5b490d671bf3a9 /Documentation
parent4438a02fc4956f5f61918095708f183f5c63a9d3 (diff)
parent1362fa078dae16776cd439791c6605b224ea6171 (diff)
downloadlinux-b65a0e0c84cf489bfa00d6aa6c48abc5a237100f.tar.gz
linux-b65a0e0c84cf489bfa00d6aa6c48abc5a237100f.tar.bz2
linux-b65a0e0c84cf489bfa00d6aa6c48abc5a237100f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/dns_resolver.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/networking/dns_resolver.txt b/Documentation/networking/dns_resolver.txt
index aefd1e681804..04ca06325b08 100644
--- a/Documentation/networking/dns_resolver.txt
+++ b/Documentation/networking/dns_resolver.txt
@@ -61,7 +61,6 @@ before the more general line given above as the first match is the one taken.
create dns_resolver foo:* * /usr/sbin/dns.foo %k
-
=====
USAGE
=====
@@ -104,6 +103,14 @@ implemented in the module can be called after doing:
returned also.
+===============================
+READING DNS KEYS FROM USERSPACE
+===============================
+
+Keys of dns_resolver type can be read from userspace using keyctl_read() or
+"keyctl read/print/pipe".
+
+
=========
MECHANISM
=========