]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
keys: make the keyring quotas controllable through /proc/sys
authorDavid Howells <dhowells@redhat.com>
Tue, 29 Apr 2008 08:01:32 +0000 (01:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 15:06:17 +0000 (08:06 -0700)
commit0b77f5bfb45c13e1e5142374f9d6ca75292252a4
treecf62055536d267e9a4abe6518e5d9f683a1ceb75
parent69664cf16af4f31cd54d77948a4baf9c7e0ca7b9
keys: make the keyring quotas controllable through /proc/sys

Make the keyring quotas controllable through /proc/sys files:

 (*) /proc/sys/kernel/keys/root_maxkeys
     /proc/sys/kernel/keys/root_maxbytes

     Maximum number of keys that root may have and the maximum total number of
     bytes of data that root may have stored in those keys.

 (*) /proc/sys/kernel/keys/maxkeys
     /proc/sys/kernel/keys/maxbytes

     Maximum number of keys that each non-root user may have and the maximum
     total number of bytes of data that each of those users may have stored in
     their keys.

Also increase the quotas as a number of people have been complaining that it's
not big enough.  I'm not sure that it's big enough now either, but on the
other hand, it can now be set in /etc/sysctl.conf.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: <kwc@citi.umich.edu>
Cc: <arunsr@cse.iitk.ac.in>
Cc: <dwalsh@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Documentation/keys.txt
include/linux/key.h
kernel/sysctl.c
security/keys/Makefile
security/keys/internal.h
security/keys/key.c
security/keys/keyctl.c
security/keys/proc.c
security/keys/sysctl.c [new file with mode: 0644]