Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4585bc2 authored by Tyler Hicks's avatar Tyler Hicks Committed by John Johansen
Browse files

apparmor: Fully initialize aa_perms struct when answering userspace query 



Fully initialize the aa_perms struct in profile_query_cb() to avoid the
potential of using an uninitialized struct member's value in a response
to a query from userspace.

Detected by CoverityScan CID#1415126 ("Uninitialized scalar variable")

Fixes: 4f3b3f2d ("apparmor: add profile permission query ability")
Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Acked-by: default avatarSerge Hallyn <serge@hallyn.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 7f3ebcf2

security/apparmor/apparmorfs.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -603,7 +603,7 @@ static const struct file_operations aa_fs_ns_revision_fops = { 
static void profile_query_cb(struct aa_profile *profile, struct aa_perms *perms,

static void profile_query_cb(struct aa_profile *profile, struct aa_perms *perms,

			     const char *match_str, size_t match_len)

			     const char *match_str, size_t match_len)

{

{

	struct aa_perms tmp;

	struct aa_perms tmp = { };

	struct aa_dfa *dfa;

	struct aa_dfa *dfa;

	unsigned int state = 0;

	unsigned int state = 0;
@@ -613,7 +613,6 @@ static void profile_query_cb(struct aa_profile *profile, struct aa_perms *perms, 
		dfa = profile->file.dfa;

		dfa = profile->file.dfa;

		state = aa_dfa_match_len(dfa, profile->file.start,

		state = aa_dfa_match_len(dfa, profile->file.start,

					 match_str + 1, match_len - 1);

					 match_str + 1, match_len - 1);

		tmp = nullperms;

		if (state) {

		if (state) {

			struct path_cond cond = { };

			struct path_cond cond = { };
@@ -627,8 +626,6 @@ static void profile_query_cb(struct aa_profile *profile, struct aa_perms *perms, 
					 match_str, match_len);

					 match_str, match_len);

		if (state)

		if (state)

			aa_compute_perms(dfa, state, &tmp);

			aa_compute_perms(dfa, state, &tmp);

		else

			tmp = nullperms;

	}

	}

	aa_apply_modes_to_perms(profile, &tmp);

	aa_apply_modes_to_perms(profile, &tmp);

	aa_perms_accum_raw(perms, &tmp);

	aa_perms_accum_raw(perms, &tmp);