Commit 57bb8e37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'apparmor-pr-2018-08-23' of... 

Merge tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

Pull apparmor updates from John Johansen:
 "There is nothing major this time just four bug fixes and a patch to
  remove some dead code:

  Cleanups:
   - remove no-op permission check in policy_unpack

  Bug fixes:
   - fix an error code in __aa_create_ns()
   - fix failure to audit context info in build_change_hat
   - check buffer bounds when mapping permissions mask
   - fully initialize aa_perms struct when answering userspace query"

* tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: remove no-op permission check in policy_unpack
  apparmor: fix an error code in __aa_create_ns()
  apparmor: Fix failure to audit context info in build_change_hat
  apparmor: Fully initialize aa_perms struct when answering userspace query
  apparmor: Check buffer bounds when mapping permissions mask
parents aa5b1054 c037bd61

security/apparmor/apparmorfs.c

+1 −4
Original line number 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,

			     const char *match_str, size_t match_len)

{

	struct aa_perms tmp;

	struct aa_perms tmp = { };

	struct aa_dfa *dfa;

	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;

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

					 match_str + 1, match_len - 1);

		tmp = nullperms;

		if (state) {

			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);

		if (state)

			aa_compute_perms(dfa, state, &tmp);

		else

			tmp = nullperms;

	}

	aa_apply_modes_to_perms(profile, &tmp);

	aa_perms_accum_raw(perms, &tmp);

security/apparmor/domain.c

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ static struct aa_label *build_change_hat(struct aa_profile *profile, 
audit:

	aa_audit_file(profile, &nullperms, OP_CHANGE_HAT, AA_MAY_CHANGEHAT,

		      name, hat ? hat->base.hname : NULL,

		      hat ? &hat->label : NULL, GLOBAL_ROOT_UID, NULL,

		      hat ? &hat->label : NULL, GLOBAL_ROOT_UID, info,

		      error);

	if (!hat || (error && error != -ENOENT))

		return ERR_PTR(error);

security/apparmor/file.c

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ static void audit_file_mask(struct audit_buffer *ab, u32 mask) 
{

	char str[10];



	aa_perm_mask_to_str(str, aa_file_perm_chrs, map_mask_to_chr_mask(mask));

	aa_perm_mask_to_str(str, sizeof(str), aa_file_perm_chrs,

			    map_mask_to_chr_mask(mask));

	audit_log_string(ab, str);

}

security/apparmor/include/perms.h

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ extern struct aa_perms allperms; 
	xcheck(fn_for_each((L1), (P), (FN1)), fn_for_each((L2), (P), (FN2)))





void aa_perm_mask_to_str(char *str, const char *chrs, u32 mask);

void aa_perm_mask_to_str(char *str, size_t str_size, const char *chrs,

			 u32 mask);

void aa_audit_perm_names(struct audit_buffer *ab, const char * const *names,

			 u32 mask);

void aa_audit_perm_mask(struct audit_buffer *ab, u32 mask, const char *chrs,

security/apparmor/lib.c

+13 −4
Original line number Diff line number Diff line
@@ -198,15 +198,24 @@ const char *aa_file_perm_names[] = { 
/**

 * aa_perm_mask_to_str - convert a perm mask to its short string

 * @str: character buffer to store string in (at least 10 characters)

 * @str_size: size of the @str buffer

 * @chrs: NUL-terminated character buffer of permission characters

 * @mask: permission mask to convert

 */

void aa_perm_mask_to_str(char *str, const char *chrs, u32 mask)

void aa_perm_mask_to_str(char *str, size_t str_size, const char *chrs, u32 mask)

{

	unsigned int i, perm = 1;

	size_t num_chrs = strlen(chrs);



	for (i = 0; i < num_chrs; perm <<= 1, i++) {

		if (mask & perm) {

			/* Ensure that one byte is left for NUL-termination */

			if (WARN_ON_ONCE(str_size <= 1))

				break;



	for (i = 0; i < 32; perm <<= 1, i++) {

		if (mask & perm)

			*str++ = chrs[i];

			str_size--;

		}

	}

	*str = '\0';

}
@@ -236,7 +245,7 @@ void aa_audit_perm_mask(struct audit_buffer *ab, u32 mask, const char *chrs, 


	audit_log_format(ab, "\"");

	if ((mask & chrsmask) && chrs) {

		aa_perm_mask_to_str(str, chrs, mask & chrsmask);

		aa_perm_mask_to_str(str, sizeof(str), chrs, mask & chrsmask);

		mask &= ~chrsmask;

		audit_log_format(ab, "%s", str);

		if (mask & namesmask)

CRA Git | Maintained and supported by SUSTech CRA and CCSE