Commit f4a2d282 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by John Johansen
Browse files

apparmor: Use struct_size() helper in kzalloc() 

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 worse scenario, could lead to heap overflows.

Link: https://github.com/KSPP/linux/issues/160


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 4d47fbbe

security/apparmor/label.c

+1 −2
Original line number Diff line number Diff line
@@ -424,8 +424,7 @@ struct aa_label *aa_label_alloc(int size, struct aa_proxy *proxy, gfp_t gfp) 
	AA_BUG(size < 1);



	/*  + 1 for null terminator entry on vec */

	new = kzalloc(sizeof(*new) + sizeof(struct aa_profile *) * (size + 1),

			gfp);

	new = kzalloc(struct_size(new, vec, size + 1), gfp);

	AA_DEBUG("%s (%p)\n", __func__, new);

	if (!new)

		goto fail;

security/apparmor/policy.c

+1 −2
Original line number Diff line number Diff line
@@ -259,8 +259,7 @@ struct aa_profile *aa_alloc_profile(const char *hname, struct aa_proxy *proxy, 
	struct aa_profile *profile;



	/* freed by free_profile - usually through aa_put_profile */

	profile = kzalloc(sizeof(*profile) + sizeof(struct aa_profile *) * 2,

			  gfp);

	profile = kzalloc(struct_size(profile, label.vec, 2), gfp);

	if (!profile)

		return NULL;