projects/linux·commit 3dccff8d

[PATCH] Keys: Fix key quota management on key allocation

3dccff8d · David Howells <[email protected]> · 2006-03-25 03:06:51 -08:00

Make key quota detection generate an error if either quota is exceeded rather
than only if both quotas are exceeded.

Signed-off-by: David Howells <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
3dccff8dc00994428777f483922058c554db85bd
Parents
a7d06ca7

Changes

1 files changed · +2 −2

FileStatusAddDelContent
security/keys/key.cmodified+2−2View file

security/keys/key.c

View file
diff --git a/security/keys/key.c b/security/keys/key.c
index 99781b7..6276971 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -1,6 +1,6 @@
/* key.c: basic authentication token and access key management
*
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2004-6 Red Hat, Inc. All Rights Reserved.
* Written by David Howells ([email protected])
*
* This program is free software; you can redistribute it and/or
@@ -271,7 +271,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
* its description */
if (!not_in_quota) {
spin_lock(&user->lock);
- if (user->qnkeys + 1 >= KEYQUOTA_MAX_KEYS &&
+ if (user->qnkeys + 1 >= KEYQUOTA_MAX_KEYS ||
user->qnbytes + quotalen >= KEYQUOTA_MAX_BYTES
)
goto no_quota;