KEYS: allow reaching the keys quotas exactly
Subsystems (2)
PATCH 1/1 KEYS: allow reaching the keys quotas exactly
From: Eric Biggers <[email protected]>
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 <[email protected]> # v2.6.26+
Signed-off-by Eric Biggers <[email protected]>
--- security/keys/key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/keys/key.c +2 -2
@@ -265,8 +265,8 @@ struct key *key_alloc(struct key_type *type, const char *desc,spin_lock (&user->lock);if (!(flags &KEY_ALLOC_QUOTA_OVERRUN )) { -if (user->qnkeys +1 >= maxkeys || - user->qnbytes + quotalen >= maxbytes || +if (user->qnkeys +1 > maxkeys || + user->qnbytes + quotalen > maxbytes || user->qnbytes + quotalen < user->qnbytes) goto no_quota; }
Signature · 1 line
2.20.1.791.gb4d0f1c61a-goog