Merge branch 'sched/urgent' into sched/core, to pick up fixes before merging new patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index fb111eafcb89..1c3872aeed14 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -751,16 +751,16 @@ long keyctl_read_key(key_serial_t keyid, char __user *buffer, size_t buflen)
 
         /* the key is probably readable - now try to read it */
 can_read_key:
-        ret = key_validate(key);
-        if (ret == 0) {
-                ret = -EOPNOTSUPP;
-                if (key->type->read) {
-                        /* read the data with the semaphore held (since we
-                         * might sleep) */
-                        down_read(&key->sem);
+        ret = -EOPNOTSUPP;
+        if (key->type->read) {
+                /* Read the data with the semaphore held (since we might sleep)
+                 * to protect against the key being updated or revoked.
+                 */
+                down_read(&key->sem);
+                ret = key_validate(key);
+                if (ret == 0)
                         ret = key->type->read(key, buffer, buflen);
-                        up_read(&key->sem);
-                }
+                up_read(&key->sem);
         }
 
 error2: