summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavoars@kernel.org>2022-01-25 02:56:06 +0100
committerJohn Johansen <john.johansen@canonical.com>2022-07-10 00:13:59 +0200
commitc0ea4b919daed7333ebc0d630adc262eb0a0d8c1 (patch)
tree90e05ac966f10b68842cf69dfd8c5899a947dd78
parentapparmor: Fix failed mount permission check error message (diff)
downloadlinux-c0ea4b919daed7333ebc0d630adc262eb0a0d8c1.tar.xz
linux-c0ea4b919daed7333ebc0d630adc262eb0a0d8c1.zip
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 <gustavoars@kernel.org> Signed-off-by: John Johansen <john.johansen@canonical.com>
-rw-r--r--security/apparmor/lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index fa49b81eb54c..5eda003c0d45 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;