From: Gustavo A. R. Silva Date: Tue, 25 Jan 2022 01:56:06 +0000 (-0600) Subject: apparmor: Use struct_size() helper in kmalloc() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c0ea4b919daed7333ebc0d630adc262eb0a0d8c1;p=linux.git apparmor: Use struct_size() helper in kmalloc() Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows. Also, address the following sparse warnings: security/apparmor/lib.c:139:23: warning: using sizeof on a flexible structure Link: https://github.com/KSPP/linux/issues/174 Signed-off-by: Gustavo A. R. Silva Signed-off-by: John Johansen --- diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c index fa49b81eb54ca..5eda003c0d45d 100644 --- a/security/apparmor/lib.c +++ b/security/apparmor/lib.c @@ -136,7 +136,7 @@ __counted char *aa_str_alloc(int size, gfp_t gfp) { struct counted_str *str; - str = kmalloc(sizeof(struct counted_str) + size, gfp); + str = kmalloc(struct_size(str, name, size), gfp); if (!str) return NULL;