Skip to content

Commit

Permalink
FS-Cache: fix dereference of NULL user_key_payload
Browse files Browse the repository at this point in the history
commit d124b2c upstream.

When the file /proc/fs/fscache/objects (available with
CONFIG_FSCACHE_OBJECT_LIST=y) is opened, we request a user key with
description "fscache:objlist", then access its payload.  However, a
revoked key has a NULL payload, and we failed to check for this.
request_key() *does* skip revoked keys, but there is still a window
where the key can be revoked before we access its payload.

Fix it by checking for a NULL payload, treating it like a key which was
already revoked at the time it was requested.

Fixes: 4fbf429 ("FS-Cache: Allow the current state of all objects to be dumped")
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Eric Biggers authored and Greg Kroah-Hartman committed Oct 27, 2017
1 parent 63c8e45 commit d2d576e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions fs/fscache/object-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,13 @@ static void fscache_objlist_config(struct fscache_objlist_data *data)
rcu_read_lock();

confkey = user_key_payload(key);
if (!confkey) {
/* key was revoked */
rcu_read_unlock();
key_put(key);
goto no_config;
}

buf = confkey->data;

for (len = confkey->datalen - 1; len >= 0; len--) {
Expand Down

0 comments on commit d2d576e

Please sign in to comment.