Skip to contentSkip to conversation

net: sunrpc: fix slab-out-of-bounds read in cache_seq_start_rcu

PATCH In review Alessandro Zanni 2 participants 2 messages Apr 28

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: sunrpc: fix slab-out-of-bounds read in cache_seq_start_rcu

Syzbot reported slab-out-of-bounds read in cache_seq_start_rcu().

The issue happens in function __cache_seq_start() when is invoked hlist_for_each_entry_rcu() and the hash value is greater than the hash_size.

This fix verifies that the hash index is within the hash_size value before dereferencing the hash table: if the hash index is out of bounds return NULL, otherwise access the value.

Fixes ae74136b4bb6 ("SUNRPC: Allow cache lookups to use RCU protection rather than the r/w spinlock")
Reported-by [email protected]
---
 net/sunrpc/cache.c | 3 +++
 1 file changed, 3 insertions(+)
net/sunrpc/cache.c +3 -0
index 7081c1214e6c..aac5f03112f5 100644
@@ -1348,6 +1348,9 @@ static void *__cache_seq_start(struct seq_file *m, loff_t *pos)
 	hash = n >> 32;
 	entry = n & ((1LL<<32) - 1);
 
+	if (hash >= cd->hash_size)
+		return NULL;
+
 	hlist_for_each_entry_rcu(ch, &cd->hash_table[hash], cache_list)
 		if (!entry--)
 			return ch;
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 33 lines · Alessandro Zanni

Syzbot reported slab-out-of-bounds read in cache_seq_start_rcu().

The issue happens in function __cache_seq_start() when is invoked hlist_for_each_entry_rcu() and the hash value is greater than the hash_size.

This fix verifies that the hash index is within the hash_size value before dereferencing the hash table: if the hash index is out of bounds return NULL, otherwise access the value.

Fixes ae74136b4bb6 ("SUNRPC: Allow cache lookups to use RCU protection

rather than the r/w spinlock")

---
 net/sunrpc/cache.c | 3 +++
 1 file changed, 3 insertions(+)
net/sunrpc/cache.c +3 -0
index 7081c1214e6c..aac5f03112f5 100644
@@ -1348,6 +1348,9 @@ static void *__cache_seq_start(struct seq_file 
 *m, loff_t *pos)
 	hash = n >> 32;
 	entry = n & ((1LL<<32) - 1);
 
+	if (hash >= cd->hash_size)
+		return NULL;
+
 	hlist_for_each_entry_rcu(ch, &cd->hash_table[hash], cache_list)
 		if (!entry--)
Quoted 3 lines

return ch;

Signature · 1 line
2.47.3

Thank you for the patch! We have this fixed in the nfsd-testing tree already:

https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git/commit/?h=nfsd-testing&id=72fe9e528c68aa7b9ed5afab98c44f8b83bbe287

Signature · 1 line
Chuck Lever