Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-block.git] / Documentation / sysctl / net.txt

diff --git a/Documentation/sysctl/net.txt b/Documentation/sysctl/net.txt
index 809ab6efcc744ec3dcad28bb075d696e6613f836..f0480f7ea7404c777c1a8943047278d6765a4fe6 100644 (file)
--- a/Documentation/sysctl/net.txt
+++ b/Documentation/sysctl/net.txt
@@ -43,6 +43,17 @@ Values :
        1 - enable the JIT
        2 - enable the JIT and ask the compiler to emit traces on kernel log.
 
+bpf_jit_harden
+--------------
+
+This enables hardening for the Berkeley Packet Filter Just in Time compiler.
+Supported are eBPF JIT backends. Enabling hardening trades off performance,
+but can mitigate JIT spraying.
+Values :
+       0 - disable JIT hardening (default value)
+       1 - enable JIT hardening for unprivileged users only
+       2 - enable JIT hardening for all users
+
 dev_weight
 --------------