Skip to contentSkip to conversation

FAILED: patch "[PATCH] FS-Cache: fix dereference of NULL user_key_payload" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Oct 24, 2017 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From d124b2c53c7bee6569d2a2d0b18b4a1afde00134 Mon Sep 17 00:00:00 2001

From: Eric Biggers <[email protected]>
Date: Mon, 9 Oct 2017 12:40:00 -0700
Subject: [PATCH] FS-Cache: fix dereference of NULL user_key_payload

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 4fbf4291aa15 ("FS-Cache: Allow the current state of all objects to be dumped")
Cc <[email protected]> [v2.6.32+]
fs/fscache/object-list.c +7 -0
index b5ab06fabc60..0438d4cd91ef 100644
@@ -331,6 +331,13 @@ static void fscache_objlist_config(struct fscache_objlist_data *data)
 	rcu_read_lock();
 
 	confkey = user_key_payload_rcu(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--) {