Skip to contentSkip to conversation

rbd: Remove VLA stack usage

PATCH Superseded Tobin C. Harding 3 participants 4 messages Mar 12, 2018

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rbd: Remove VLA stack usage

The kernel would like to have all stack VLA usage removed[1]. Here the array is declared using a variable that is declared using a constant statement but the compiler still emits a warning. We can clear the warning bu using the constant statement directly. In place of later usage of the size variable we can use the ARRAY_SIZE() macro.

Use constant statement to declare array.

[1]: https://lkml.org/lkml/2018/3/7/621

---
 drivers/block/rbd.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/block/rbd.c +3 -4
index 0016170cde0a..927ecd9a2511 100644
@@ -3100,20 +3100,19 @@ static int __rbd_notify_op_lock(struct rbd_device *rbd_dev,
 {
 	struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
 	struct rbd_client_id cid = rbd_get_cid(rbd_dev);
-	int buf_size = 4 + 8 + 8 + CEPH_ENCODING_START_BLK_LEN;
-	char buf[buf_size];
+	char buf[4 + 8 + 8 + CEPH_ENCODING_START_BLK_LEN];
 	void *p = buf;
 
 	dout("%s rbd_dev %p notify_op %d\n", __func__, rbd_dev, notify_op);
 
 	/* encode *LockPayload NotifyMessage (op + ClientId) */
-	ceph_start_encoding(&p, 2, 1, buf_size - CEPH_ENCODING_START_BLK_LEN);
+	ceph_start_encoding(&p, 2, 1, ARRAY_SIZE(buf) - CEPH_ENCODING_START_BLK_LEN);
 	ceph_encode_32(&p, notify_op);
 	ceph_encode_64(&p, cid.gid);
 	ceph_encode_64(&p, cid.handle);
 
 	return ceph_osdc_notify(osdc, &rbd_dev->header_oid,
-				&rbd_dev->header_oloc, buf, buf_size,
+				&rbd_dev->header_oloc, buf, ARRAY_SIZE(buf),
 				RBD_NOTIFY_TIMEOUT, preply_pages, preply_len);
 }
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 1 line · Tobin C. Harding

The kernel would like to have all stack VLA usage removed[1].

Can you please stop writing this? The Linux kernel isn't sentient; it doesn't "like" anything. You need to explain why *you* (and other people) believe these changes should be made.

Eric

#2 lore raw
Quoted 6 lines · Eric Biggers
Quoted 1 line · Tobin C. Harding

The kernel would like to have all stack VLA usage removed[1].

Can you please stop writing this? The Linux kernel isn't sentient; it doesn't "like" anything. You need to explain why *you* (and other people) believe these changes should be made.

No worries, will re-spin with better description.

thanks,
Tobin.

maintainer
#3 lore raw
Quoted 9 lines · Tobin C. Harding
Quoted 6 lines · Eric Biggers
Quoted 1 line · Tobin C. Harding

The kernel would like to have all stack VLA usage removed[1].

Can you please stop writing this? The Linux kernel isn't sentient; it doesn't "like" anything. You need to explain why *you* (and other people) believe these changes should be made.

No worries, will re-spin with better description.

I'd prefer a single patch covering both functions.

Also, as these are char arrays, use sizeof instead of ARRAY_SIZE.

Thanks,

Ilya