KEYS: allow reaching the keys quotas exactly
authorEric Biggers <ebiggers@google.com>
Thu, 14 Feb 2019 16:20:01 +0000 (16:20 +0000)
committerJames Morris <james.morris@microsoft.com>
Fri, 15 Feb 2019 22:12:08 +0000 (14:12 -0800)
commita08bf91ce28ed3ae7b6fef35d843fef8dc8c2cd9
tree55aeebf54986fb1923cbee1d7f202e853b8f609b
parent5ded5871030eb75017639148da0a58931dfbfc25
KEYS: allow reaching the keys quotas exactly

If the sysctl 'kernel.keys.maxkeys' is set to some number n, then
actually users can only add up to 'n - 1' keys.  Likewise for
'kernel.keys.maxbytes' and the root_* versions of these sysctls.  But
these sysctls are apparently supposed to be *maximums*, as per their
names and all documentation I could find -- the keyrings(7) man page,
Documentation/security/keys/core.rst, and all the mentions of EDQUOT
meaning that the key quota was *exceeded* (as opposed to reached).

Thus, fix the code to allow reaching the quotas exactly.

Fixes: 0b77f5bfb45c ("keys: make the keyring quotas controllable through /proc/sys")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
security/keys/key.c