2017-09-19 16:51:12

by Vasily Averin

Subject: [PATCH] KEYS: key refcounting cleanup in keyctl_read_key

key_put is lost if key_permission() returns non-EACCES error

Fixes: 29db919063406 ("Keys: Add LSM hooks for key management [try #3]")
Reported-by: Konstantin Khorenko <[email protected]>
Signed-off-by: Vasily Averin <[email protected]>
---
security/keys/keyctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index ab0b337..70efb2d 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -771,7 +771,7 @@ long keyctl_read_key(key_serial_t keyid, char __user *buffer, size_t buflen)
if (ret == 0)
goto can_read_key;
if (ret != -EACCES)
- goto error;
+ goto error2;

/* we can't; see if it's searchable from this process's keyrings
* - we automatically take account of the fact that it may be
--
2.7.4

2017-09-25 15:28:15

by David Howells

Subject: Re: [PATCH] KEYS: key refcounting cleanup in keyctl_read_key

I have a patch from Eric Biggers that does the same thing that I've applied.

https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit/?h=keys-fixes&id=7fc0786d956d9e59b68d282be9b156179846ea3d

David