Skip to contentSkip to conversation

afs: Use array3_size() helper in afs_extract_to_buf()

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Jun 15, 2020 – Jun 16, 2020 Afs filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 afs: Use array3_size() helper in afs_extract_to_buf()

Use array3_size() helper instead of the open-coded version in afs_extract_to_buf(). These sorts of multiplication factors need to be wrapped in array3_size().

This issue was found with the help of Coccinelle and, audited and fixed manually.

Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83

---
 fs/afs/cmservice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/cmservice.c +1 -1
index bef413818af7..4d086f9c829e 100644
@@ -268,7 +268,7 @@ static int afs_deliver_cb_callback(struct afs_call *call)
 				       GFP_KERNEL);
 		if (!call->buffer)
 			return -ENOMEM;
-		afs_extract_to_buf(call, call->count * 3 * 4);
+		afs_extract_to_buf(call, array3_size(call->count, 3, 4));
 		call->unmarshall++;
 
 		/* Fall through */
Signature · 1 line
2.27.0
maintainer
#1 lore raw
Quoted 3 lines · Gustavo A. R. Silva

Use array3_size() helper instead of the open-coded version in afs_extract_to_buf(). These sorts of multiplication factors need to be wrapped in array3_size().

For afs_deliver_cb_callback(), this adds redundant checking, as does the one on the kmalloc() on the preceding line:

		call->buffer = kmalloc(array3_size(call->count, 3, 4),
				       GFP_KERNEL);
		if (!call->buffer)
			return -ENOMEM;

because directly above them is a range check:

		if (call->count > AFSCBMAX)
			return afs_protocol_error(call, afs_eproto_cb_fid_count);

limiting the array size to 50.

Further, note that it's *not* a 3D array. 3 * 4 is the element size and is constant. I've written it that way as the block is 3 XDR units, but the block size is actually 12 bytes.

The one in the kmalloc() should also not be using array3_size() for the same reason.

David