ceph: use struct_size() helper in __ceph_pool_perm_get()

toblux · idryomov · commit 7264745d5542 · 2024-10-03T09:31:08.000+02:00
Use struct_size() to calculate the number of bytes to be allocated.

Signed-off-by: Thorsten Blum &lt;thorsten.blum@toblux.com&gt;
Reviewed-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
@@ -2145,7 +2145,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,
 	}
 
 	pool_ns_len = pool_ns ? pool_ns->len : 0;
-	perm = kmalloc(sizeof(*perm) + pool_ns_len + 1, GFP_NOFS);
+	perm = kmalloc(struct_size(perm, pool_ns, pool_ns_len + 1), GFP_NOFS);
 	if (!perm) {
 		err = -ENOMEM;
 		goto out_unlock;

Original file line number	Diff line number	Diff line change
`@@ -2145,7 +2145,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,`
`2145`	`2145`	`}`
`2146`	`2146`
`2147`	`2147`	`pool_ns_len = pool_ns ? pool_ns->len : 0;`
`2148`		`- perm = kmalloc(sizeof(*perm) + pool_ns_len + 1, GFP_NOFS);`
	`2148`	`+ perm = kmalloc(struct_size(perm, pool_ns, pool_ns_len + 1), GFP_NOFS);`
`2149`	`2149`	`if (!perm) {`
`2150`	`2150`	`err = -ENOMEM;`
`2151`	`2151`	`goto out_unlock;`