Skip to contentSkip to conversation

staging: r8188eu: Replace zero-length array with flexible-array member

PATCH New Gustavo A. R. Silva 1 participant 1 message Sep 29, 2021 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: r8188eu: Replace zero-length array with flexible-array member

One-element and zero-length arrays are deprecated and should be replaced with flexible-array members[1].

Replace zero-length array with flexible-array member and make use of the struct_size() helper in kmalloc().

[1] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays

---
 drivers/staging/r8188eu/include/osdep_service.h | 2 +-
 drivers/staging/r8188eu/os_dep/osdep_service.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/include/osdep_service.h +1 -1
index da85a9681c4a..4622ce400e41 100644
@@ -289,7 +289,7 @@ struct rtw_cbuf {
 	u32 write;
 	u32 read;
 	u32 size;
-	void *bufs[0];
+	void *bufs[];
 };
 
 bool rtw_cbuf_empty(struct rtw_cbuf *cbuf);
drivers/staging/r8188eu/os_dep/osdep_service.c +1 -1
index 002c75f16725..d7d03c1417fd 100644
@@ -262,7 +262,7 @@ struct rtw_cbuf *rtw_cbuf_alloc(u32 size)
 {
 	struct rtw_cbuf *cbuf;
 
-	cbuf = kmalloc(sizeof(*cbuf) + sizeof(void *) * size, GFP_KERNEL);
+	cbuf = kmalloc(struct_size(cbuf, bufs, size), GFP_KERNEL);
 
 	if (cbuf) {
 		cbuf->write = 0;
Signature · 1 line
2.27.0