Commit b11e51dd authored by Rae Moar's avatar Rae Moar Committed by Shuah Khan
Browse files

apparmor: test: make static symbols visible during kunit testing 



Use macros, VISIBLE_IF_KUNIT and EXPORT_SYMBOL_IF_KUNIT, to allow
static symbols to be conditionally set to be visible during
apparmor_policy_unpack_test, which removes the need to include the testing
file in the implementation file.

Change the namespace of the symbols that are now conditionally visible (by
adding the prefix aa_) to avoid confusion with symbols of the same name.

Allow the test to be built as a module and namespace the module name from
policy_unpack_test to apparmor_policy_unpack_test to improve clarity of
the module name.

Provide an example of how static symbols can be dealt with in testing.

Signed-off-by: default avatarRae Moar <rmoar@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Acked-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 9c988fae

security/apparmor/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ config SECURITY_APPARMOR_PARANOID_LOAD 
	  Disabling the check will speed up policy loads.



config SECURITY_APPARMOR_KUNIT_TEST

	bool "Build KUnit tests for policy_unpack.c" if !KUNIT_ALL_TESTS

	depends on KUNIT=y && SECURITY_APPARMOR

	tristate "Build KUnit tests for policy_unpack.c" if !KUNIT_ALL_TESTS

	depends on KUNIT && SECURITY_APPARMOR

	default KUNIT_ALL_TESTS

	help

	  This builds the AppArmor KUnit tests.

security/apparmor/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ apparmor-y := apparmorfs.o audit.o capability.o task.o ipc.o lib.o match.o \ 
              resource.o secid.o file.o policy_ns.o label.o mount.o net.o

apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o



obj-$(CONFIG_SECURITY_APPARMOR_KUNIT_TEST) += apparmor_policy_unpack_test.o

apparmor_policy_unpack_test-objs += policy_unpack_test.o



clean-files := capability_names.h rlim_names.h net_names.h



# Build a lower case string table of address family names

security/apparmor/include/policy_unpack.h

+50 −0
Original line number Diff line number Diff line
@@ -48,6 +48,43 @@ enum { 
	AAFS_LOADDATA_NDENTS		/* count of entries */

};



/*

 * The AppArmor interface treats data as a type byte followed by the

 * actual data.  The interface has the notion of a named entry

 * which has a name (AA_NAME typecode followed by name string) followed by

 * the entries typecode and data.  Named types allow for optional

 * elements and extensions to be added and tested for without breaking

 * backwards compatibility.

 */



enum aa_code {

	AA_U8,

	AA_U16,

	AA_U32,

	AA_U64,

	AA_NAME,		/* same as string except it is items name */

	AA_STRING,

	AA_BLOB,

	AA_STRUCT,

	AA_STRUCTEND,

	AA_LIST,

	AA_LISTEND,

	AA_ARRAY,

	AA_ARRAYEND,

};



/*

 * aa_ext is the read of the buffer containing the serialized profile.  The

 * data is copied into a kernel buffer in apparmorfs and then handed off to

 * the unpack routines.

 */

struct aa_ext {

	void *start;

	void *end;

	void *pos;		/* pointer to current position in the buffer */

	u32 version;

};



/*

 * struct aa_loaddata - buffer of policy raw_data set

 *
@@ -126,4 +163,17 @@ static inline void aa_put_loaddata(struct aa_loaddata *data) 
		kref_put(&data->count, aa_loaddata_kref);

}



#if IS_ENABLED(CONFIG_KUNIT)

bool aa_inbounds(struct aa_ext *e, size_t size);

size_t aa_unpack_u16_chunk(struct aa_ext *e, char **chunk);

bool aa_unpack_X(struct aa_ext *e, enum aa_code code);

bool aa_unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name);

bool aa_unpack_u32(struct aa_ext *e, u32 *data, const char *name);

bool aa_unpack_u64(struct aa_ext *e, u64 *data, const char *name);

size_t aa_unpack_array(struct aa_ext *e, const char *name);

size_t aa_unpack_blob(struct aa_ext *e, char **blob, const char *name);

int aa_unpack_str(struct aa_ext *e, const char **string, const char *name);

int aa_unpack_strdup(struct aa_ext *e, char **string, const char *name);

#endif



#endif /* __POLICY_INTERFACE_H */

security/apparmor/policy_unpack.c

+104 −134
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include <asm/unaligned.h>

#include <kunit/visibility.h>

#include <linux/ctype.h>

#include <linux/errno.h>

#include <linux/zlib.h>
@@ -37,43 +38,6 @@ 
#define v7	7

#define v8	8	/* full network masking */



/*

 * The AppArmor interface treats data as a type byte followed by the

 * actual data.  The interface has the notion of a named entry

 * which has a name (AA_NAME typecode followed by name string) followed by

 * the entries typecode and data.  Named types allow for optional

 * elements and extensions to be added and tested for without breaking

 * backwards compatibility.

 */



enum aa_code {

	AA_U8,

	AA_U16,

	AA_U32,

	AA_U64,

	AA_NAME,		/* same as string except it is items name */

	AA_STRING,

	AA_BLOB,

	AA_STRUCT,

	AA_STRUCTEND,

	AA_LIST,

	AA_LISTEND,

	AA_ARRAY,

	AA_ARRAYEND,

};



/*

 * aa_ext is the read of the buffer containing the serialized profile.  The

 * data is copied into a kernel buffer in apparmorfs and then handed off to

 * the unpack routines.

 */

struct aa_ext {

	void *start;

	void *end;

	void *pos;		/* pointer to current position in the buffer */

	u32 version;

};



/* audit callback for unpack fields */

static void audit_cb(struct audit_buffer *ab, void *va)

{
@@ -199,10 +163,11 @@ struct aa_loaddata *aa_loaddata_alloc(size_t size) 
}



/* test if read will be in packed data bounds */

static bool inbounds(struct aa_ext *e, size_t size)

VISIBLE_IF_KUNIT bool aa_inbounds(struct aa_ext *e, size_t size)

{

	return (size <= e->end - e->pos);

}

EXPORT_SYMBOL_IF_KUNIT(aa_inbounds);



static void *kvmemdup(const void *src, size_t len)

{
@@ -214,22 +179,22 @@ static void *kvmemdup(const void *src, size_t len) 
}



/**

 * unpack_u16_chunk - test and do bounds checking for a u16 size based chunk

 * aa_unpack_u16_chunk - test and do bounds checking for a u16 size based chunk

 * @e: serialized data read head (NOT NULL)

 * @chunk: start address for chunk of data (NOT NULL)

 *

 * Returns: the size of chunk found with the read head at the end of the chunk.

 */

static size_t unpack_u16_chunk(struct aa_ext *e, char **chunk)

VISIBLE_IF_KUNIT size_t aa_unpack_u16_chunk(struct aa_ext *e, char **chunk)

{

	size_t size = 0;

	void *pos = e->pos;



	if (!inbounds(e, sizeof(u16)))

	if (!aa_inbounds(e, sizeof(u16)))

		goto fail;

	size = le16_to_cpu(get_unaligned((__le16 *) e->pos));

	e->pos += sizeof(__le16);

	if (!inbounds(e, size))

	if (!aa_inbounds(e, size))

		goto fail;

	*chunk = e->pos;

	e->pos += size;
@@ -239,20 +204,22 @@ static size_t unpack_u16_chunk(struct aa_ext *e, char **chunk) 
	e->pos = pos;

	return 0;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_u16_chunk);



/* unpack control byte */

static bool unpack_X(struct aa_ext *e, enum aa_code code)

VISIBLE_IF_KUNIT bool aa_unpack_X(struct aa_ext *e, enum aa_code code)

{

	if (!inbounds(e, 1))

	if (!aa_inbounds(e, 1))

		return false;

	if (*(u8 *) e->pos != code)

		return false;

	e->pos++;

	return true;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_X);



/**

 * unpack_nameX - check is the next element is of type X with a name of @name

 * aa_unpack_nameX - check is the next element is of type X with a name of @name

 * @e: serialized data extent information  (NOT NULL)

 * @code: type code

 * @name: name to match to the serialized element.  (MAYBE NULL)
@@ -267,7 +234,7 @@ static bool unpack_X(struct aa_ext *e, enum aa_code code) 
 *

 * Returns: false if either match fails, the read head does not move

 */

static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name)

VISIBLE_IF_KUNIT bool aa_unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name)

{

	/*

	 * May need to reset pos if name or type doesn't match
@@ -277,9 +244,9 @@ static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name) 
	 * Check for presence of a tagname, and if present name size

	 * AA_NAME tag value is a u16.

	 */

	if (unpack_X(e, AA_NAME)) {

	if (aa_unpack_X(e, AA_NAME)) {

		char *tag = NULL;

		size_t size = unpack_u16_chunk(e, &tag);

		size_t size = aa_unpack_u16_chunk(e, &tag);

		/* if a name is specified it must match. otherwise skip tag */

		if (name && (!size || tag[size-1] != '\0' || strcmp(name, tag)))

			goto fail;
@@ -289,20 +256,21 @@ static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name) 
	}



	/* now check if type code matches */

	if (unpack_X(e, code))

	if (aa_unpack_X(e, code))

		return true;



fail:

	e->pos = pos;

	return false;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_nameX);



static bool unpack_u8(struct aa_ext *e, u8 *data, const char *name)

{

	void *pos = e->pos;



	if (unpack_nameX(e, AA_U8, name)) {

		if (!inbounds(e, sizeof(u8)))

	if (aa_unpack_nameX(e, AA_U8, name)) {

		if (!aa_inbounds(e, sizeof(u8)))

			goto fail;

		if (data)

			*data = *((u8 *)e->pos);
@@ -315,12 +283,12 @@ static bool unpack_u8(struct aa_ext *e, u8 *data, const char *name) 
	return false;

}



static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)

VISIBLE_IF_KUNIT bool aa_unpack_u32(struct aa_ext *e, u32 *data, const char *name)

{

	void *pos = e->pos;



	if (unpack_nameX(e, AA_U32, name)) {

		if (!inbounds(e, sizeof(u32)))

	if (aa_unpack_nameX(e, AA_U32, name)) {

		if (!aa_inbounds(e, sizeof(u32)))

			goto fail;

		if (data)

			*data = le32_to_cpu(get_unaligned((__le32 *) e->pos));
@@ -332,13 +300,14 @@ static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name) 
	e->pos = pos;

	return false;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_u32);



static bool unpack_u64(struct aa_ext *e, u64 *data, const char *name)

VISIBLE_IF_KUNIT bool aa_unpack_u64(struct aa_ext *e, u64 *data, const char *name)

{

	void *pos = e->pos;



	if (unpack_nameX(e, AA_U64, name)) {

		if (!inbounds(e, sizeof(u64)))

	if (aa_unpack_nameX(e, AA_U64, name)) {

		if (!aa_inbounds(e, sizeof(u64)))

			goto fail;

		if (data)

			*data = le64_to_cpu(get_unaligned((__le64 *) e->pos));
@@ -350,14 +319,15 @@ static bool unpack_u64(struct aa_ext *e, u64 *data, const char *name) 
	e->pos = pos;

	return false;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_u64);



static size_t unpack_array(struct aa_ext *e, const char *name)

VISIBLE_IF_KUNIT size_t aa_unpack_array(struct aa_ext *e, const char *name)

{

	void *pos = e->pos;



	if (unpack_nameX(e, AA_ARRAY, name)) {

	if (aa_unpack_nameX(e, AA_ARRAY, name)) {

		int size;

		if (!inbounds(e, sizeof(u16)))

		if (!aa_inbounds(e, sizeof(u16)))

			goto fail;

		size = (int)le16_to_cpu(get_unaligned((__le16 *) e->pos));

		e->pos += sizeof(u16);
@@ -368,18 +338,19 @@ static size_t unpack_array(struct aa_ext *e, const char *name) 
	e->pos = pos;

	return 0;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_array);



static size_t unpack_blob(struct aa_ext *e, char **blob, const char *name)

VISIBLE_IF_KUNIT size_t aa_unpack_blob(struct aa_ext *e, char **blob, const char *name)

{

	void *pos = e->pos;



	if (unpack_nameX(e, AA_BLOB, name)) {

	if (aa_unpack_nameX(e, AA_BLOB, name)) {

		u32 size;

		if (!inbounds(e, sizeof(u32)))

		if (!aa_inbounds(e, sizeof(u32)))

			goto fail;

		size = le32_to_cpu(get_unaligned((__le32 *) e->pos));

		e->pos += sizeof(u32);

		if (inbounds(e, (size_t) size)) {

		if (aa_inbounds(e, (size_t) size)) {

			*blob = e->pos;

			e->pos += size;

			return size;
@@ -390,15 +361,16 @@ static size_t unpack_blob(struct aa_ext *e, char **blob, const char *name) 
	e->pos = pos;

	return 0;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_blob);



static int unpack_str(struct aa_ext *e, const char **string, const char *name)

VISIBLE_IF_KUNIT int aa_unpack_str(struct aa_ext *e, const char **string, const char *name)

{

	char *src_str;

	size_t size = 0;

	void *pos = e->pos;

	*string = NULL;

	if (unpack_nameX(e, AA_STRING, name)) {

		size = unpack_u16_chunk(e, &src_str);

	if (aa_unpack_nameX(e, AA_STRING, name)) {

		size = aa_unpack_u16_chunk(e, &src_str);

		if (size) {

			/* strings are null terminated, length is size - 1 */

			if (src_str[size - 1] != 0)
@@ -413,12 +385,13 @@ static int unpack_str(struct aa_ext *e, const char **string, const char *name) 
	e->pos = pos;

	return 0;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_str);



static int unpack_strdup(struct aa_ext *e, char **string, const char *name)

VISIBLE_IF_KUNIT int aa_unpack_strdup(struct aa_ext *e, char **string, const char *name)

{

	const char *tmp;

	void *pos = e->pos;

	int res = unpack_str(e, &tmp, name);

	int res = aa_unpack_str(e, &tmp, name);

	*string = NULL;



	if (!res)
@@ -432,6 +405,7 @@ static int unpack_strdup(struct aa_ext *e, char **string, const char *name) 


	return res;

}

EXPORT_SYMBOL_IF_KUNIT(aa_unpack_strdup);





/**
@@ -446,7 +420,7 @@ static struct aa_dfa *unpack_dfa(struct aa_ext *e) 
	size_t size;

	struct aa_dfa *dfa = NULL;



	size = unpack_blob(e, &blob, "aadfa");

	size = aa_unpack_blob(e, &blob, "aadfa");

	if (size) {

		/*

		 * The dfa is aligned with in the blob to 8 bytes
@@ -482,10 +456,10 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) 
	void *saved_pos = e->pos;



	/* exec table is optional */

	if (unpack_nameX(e, AA_STRUCT, "xtable")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "xtable")) {

		int i, size;



		size = unpack_array(e, NULL);

		size = aa_unpack_array(e, NULL);

		/* currently 4 exec bits and entries 0-3 are reserved iupcx */

		if (size > 16 - 4)

			goto fail;
@@ -497,8 +471,8 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) 
		profile->file.trans.size = size;

		for (i = 0; i < size; i++) {

			char *str;

			int c, j, pos, size2 = unpack_strdup(e, &str, NULL);

			/* unpack_strdup verifies that the last character is

			int c, j, pos, size2 = aa_unpack_strdup(e, &str, NULL);

			/* aa_unpack_strdup verifies that the last character is

			 * null termination byte.

			 */

			if (!size2)
@@ -521,7 +495,7 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) 
					goto fail;

				/* beginning with : requires an embedded \0,

				 * verify that exactly 1 internal \0 exists

				 * trailing \0 already verified by unpack_strdup

				 * trailing \0 already verified by aa_unpack_strdup

				 *

				 * convert \0 back to : for label_parse

				 */
@@ -533,9 +507,9 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) 
				/* fail - all other cases with embedded \0 */

				goto fail;

		}

		if (!unpack_nameX(e, AA_ARRAYEND, NULL))

		if (!aa_unpack_nameX(e, AA_ARRAYEND, NULL))

			goto fail;

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	}

	return true;
@@ -550,21 +524,21 @@ static bool unpack_xattrs(struct aa_ext *e, struct aa_profile *profile) 
{

	void *pos = e->pos;



	if (unpack_nameX(e, AA_STRUCT, "xattrs")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "xattrs")) {

		int i, size;



		size = unpack_array(e, NULL);

		size = aa_unpack_array(e, NULL);

		profile->xattr_count = size;

		profile->xattrs = kcalloc(size, sizeof(char *), GFP_KERNEL);

		if (!profile->xattrs)

			goto fail;

		for (i = 0; i < size; i++) {

			if (!unpack_strdup(e, &profile->xattrs[i], NULL))

			if (!aa_unpack_strdup(e, &profile->xattrs[i], NULL))

				goto fail;

		}

		if (!unpack_nameX(e, AA_ARRAYEND, NULL))

		if (!aa_unpack_nameX(e, AA_ARRAYEND, NULL))

			goto fail;

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	}
@@ -580,8 +554,8 @@ static bool unpack_secmark(struct aa_ext *e, struct aa_profile *profile) 
	void *pos = e->pos;

	int i, size;



	if (unpack_nameX(e, AA_STRUCT, "secmark")) {

		size = unpack_array(e, NULL);

	if (aa_unpack_nameX(e, AA_STRUCT, "secmark")) {

		size = aa_unpack_array(e, NULL);



		profile->secmark = kcalloc(size, sizeof(struct aa_secmark),

					   GFP_KERNEL);
@@ -595,12 +569,12 @@ static bool unpack_secmark(struct aa_ext *e, struct aa_profile *profile) 
				goto fail;

			if (!unpack_u8(e, &profile->secmark[i].deny, NULL))

				goto fail;

			if (!unpack_strdup(e, &profile->secmark[i].label, NULL))

			if (!aa_unpack_strdup(e, &profile->secmark[i].label, NULL))

				goto fail;

		}

		if (!unpack_nameX(e, AA_ARRAYEND, NULL))

		if (!aa_unpack_nameX(e, AA_ARRAYEND, NULL))

			goto fail;

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	}
@@ -624,26 +598,26 @@ static bool unpack_rlimits(struct aa_ext *e, struct aa_profile *profile) 
	void *pos = e->pos;



	/* rlimits are optional */

	if (unpack_nameX(e, AA_STRUCT, "rlimits")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "rlimits")) {

		int i, size;

		u32 tmp = 0;

		if (!unpack_u32(e, &tmp, NULL))

		if (!aa_unpack_u32(e, &tmp, NULL))

			goto fail;

		profile->rlimits.mask = tmp;



		size = unpack_array(e, NULL);

		size = aa_unpack_array(e, NULL);

		if (size > RLIM_NLIMITS)

			goto fail;

		for (i = 0; i < size; i++) {

			u64 tmp2 = 0;

			int a = aa_map_resource(i);

			if (!unpack_u64(e, &tmp2, NULL))

			if (!aa_unpack_u64(e, &tmp2, NULL))

				goto fail;

			profile->rlimits.limits[a].rlim_max = tmp2;

		}

		if (!unpack_nameX(e, AA_ARRAYEND, NULL))

		if (!aa_unpack_nameX(e, AA_ARRAYEND, NULL))

			goto fail;

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	}

	return true;
@@ -691,9 +665,9 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
	*ns_name = NULL;



	/* check that we have the right struct being passed */

	if (!unpack_nameX(e, AA_STRUCT, "profile"))

	if (!aa_unpack_nameX(e, AA_STRUCT, "profile"))

		goto fail;

	if (!unpack_str(e, &name, NULL))

	if (!aa_unpack_str(e, &name, NULL))

		goto fail;

	if (*name == '\0')

		goto fail;
@@ -713,10 +687,10 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
		return ERR_PTR(-ENOMEM);



	/* profile renaming is optional */

	(void) unpack_str(e, &profile->rename, "rename");

	(void) aa_unpack_str(e, &profile->rename, "rename");



	/* attachment string is optional */

	(void) unpack_str(e, &profile->attach, "attach");

	(void) aa_unpack_str(e, &profile->attach, "attach");



	/* xmatch is optional and may be NULL */

	profile->xmatch = unpack_dfa(e);
@@ -728,7 +702,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
	}

	/* xmatch_len is not optional if xmatch is set */

	if (profile->xmatch) {

		if (!unpack_u32(e, &tmp, NULL)) {

		if (!aa_unpack_u32(e, &tmp, NULL)) {

			info = "missing xmatch len";

			goto fail;

		}
@@ -736,15 +710,15 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
	}



	/* disconnected attachment string is optional */

	(void) unpack_str(e, &profile->disconnected, "disconnected");

	(void) aa_unpack_str(e, &profile->disconnected, "disconnected");



	/* per profile debug flags (complain, audit) */

	if (!unpack_nameX(e, AA_STRUCT, "flags")) {

	if (!aa_unpack_nameX(e, AA_STRUCT, "flags")) {

		info = "profile missing flags";

		goto fail;

	}

	info = "failed to unpack profile flags";

	if (!unpack_u32(e, &tmp, NULL))

	if (!aa_unpack_u32(e, &tmp, NULL))

		goto fail;

	if (tmp & PACKED_FLAG_HAT)

		profile->label.flags |= FLAG_HAT;
@@ -752,7 +726,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
		profile->label.flags |= FLAG_DEBUG1;

	if (tmp & PACKED_FLAG_DEBUG2)

		profile->label.flags |= FLAG_DEBUG2;

	if (!unpack_u32(e, &tmp, NULL))

	if (!aa_unpack_u32(e, &tmp, NULL))

		goto fail;

	if (tmp == PACKED_MODE_COMPLAIN || (e->version & FORCE_COMPLAIN_FLAG)) {

		profile->mode = APPARMOR_COMPLAIN;
@@ -766,16 +740,16 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
	} else {

		goto fail;

	}

	if (!unpack_u32(e, &tmp, NULL))

	if (!aa_unpack_u32(e, &tmp, NULL))

		goto fail;

	if (tmp)

		profile->audit = AUDIT_ALL;



	if (!unpack_nameX(e, AA_STRUCTEND, NULL))

	if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

		goto fail;



	/* path_flags is optional */

	if (unpack_u32(e, &profile->path_flags, "path_flags"))

	if (aa_unpack_u32(e, &profile->path_flags, "path_flags"))

		profile->path_flags |= profile->label.flags &

			PATH_MEDIATE_DELETED;

	else
@@ -783,38 +757,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
		profile->path_flags = PATH_MEDIATE_DELETED;



	info = "failed to unpack profile capabilities";

	if (!unpack_u32(e, &(profile->caps.allow.cap[0]), NULL))

	if (!aa_unpack_u32(e, &(profile->caps.allow.cap[0]), NULL))

		goto fail;

	if (!unpack_u32(e, &(profile->caps.audit.cap[0]), NULL))

	if (!aa_unpack_u32(e, &(profile->caps.audit.cap[0]), NULL))

		goto fail;

	if (!unpack_u32(e, &(profile->caps.quiet.cap[0]), NULL))

	if (!aa_unpack_u32(e, &(profile->caps.quiet.cap[0]), NULL))

		goto fail;

	if (!unpack_u32(e, &tmpcap.cap[0], NULL))

	if (!aa_unpack_u32(e, &tmpcap.cap[0], NULL))

		goto fail;



	info = "failed to unpack upper profile capabilities";

	if (unpack_nameX(e, AA_STRUCT, "caps64")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "caps64")) {

		/* optional upper half of 64 bit caps */

		if (!unpack_u32(e, &(profile->caps.allow.cap[1]), NULL))

		if (!aa_unpack_u32(e, &(profile->caps.allow.cap[1]), NULL))

			goto fail;

		if (!unpack_u32(e, &(profile->caps.audit.cap[1]), NULL))

		if (!aa_unpack_u32(e, &(profile->caps.audit.cap[1]), NULL))

			goto fail;

		if (!unpack_u32(e, &(profile->caps.quiet.cap[1]), NULL))

		if (!aa_unpack_u32(e, &(profile->caps.quiet.cap[1]), NULL))

			goto fail;

		if (!unpack_u32(e, &(tmpcap.cap[1]), NULL))

		if (!aa_unpack_u32(e, &(tmpcap.cap[1]), NULL))

			goto fail;

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	}



	info = "failed to unpack extended profile capabilities";

	if (unpack_nameX(e, AA_STRUCT, "capsx")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "capsx")) {

		/* optional extended caps mediation mask */

		if (!unpack_u32(e, &(profile->caps.extended.cap[0]), NULL))

		if (!aa_unpack_u32(e, &(profile->caps.extended.cap[0]), NULL))

			goto fail;

		if (!unpack_u32(e, &(profile->caps.extended.cap[1]), NULL))

		if (!aa_unpack_u32(e, &(profile->caps.extended.cap[1]), NULL))

			goto fail;

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	}
@@ -833,7 +807,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
		goto fail;

	}



	if (unpack_nameX(e, AA_STRUCT, "policydb")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "policydb")) {

		/* generic policy dfa - optional and may be NULL */

		info = "failed to unpack policydb";

		profile->policy.dfa = unpack_dfa(e);
@@ -845,7 +819,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
			error = -EPROTO;

			goto fail;

		}

		if (!unpack_u32(e, &profile->policy.start[0], "start"))

		if (!aa_unpack_u32(e, &profile->policy.start[0], "start"))

			/* default start state */

			profile->policy.start[0] = DFA_START;

		/* setup class index */
@@ -855,7 +829,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
					    profile->policy.start[0],

					    i);

		}

		if (!unpack_nameX(e, AA_STRUCTEND, NULL))

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL))

			goto fail;

	} else

		profile->policy.dfa = aa_get_dfa(nulldfa);
@@ -868,7 +842,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
		info = "failed to unpack profile file rules";

		goto fail;

	} else if (profile->file.dfa) {

		if (!unpack_u32(e, &profile->file.start, "dfa_start"))

		if (!aa_unpack_u32(e, &profile->file.start, "dfa_start"))

			/* default start state */

			profile->file.start = DFA_START;

	} else if (profile->policy.dfa &&
@@ -883,7 +857,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
		goto fail;

	}



	if (unpack_nameX(e, AA_STRUCT, "data")) {

	if (aa_unpack_nameX(e, AA_STRUCT, "data")) {

		info = "out of memory";

		profile->data = kzalloc(sizeof(*profile->data), GFP_KERNEL);

		if (!profile->data)
@@ -901,7 +875,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
			goto fail;

		}



		while (unpack_strdup(e, &key, NULL)) {

		while (aa_unpack_strdup(e, &key, NULL)) {

			data = kzalloc(sizeof(*data), GFP_KERNEL);

			if (!data) {

				kfree_sensitive(key);
@@ -909,7 +883,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
			}



			data->key = key;

			data->size = unpack_blob(e, &data->data, NULL);

			data->size = aa_unpack_blob(e, &data->data, NULL);

			data->data = kvmemdup(data->data, data->size);

			if (data->size && !data->data) {

				kfree_sensitive(data->key);
@@ -921,13 +895,13 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) 
					       profile->data->p);

		}



		if (!unpack_nameX(e, AA_STRUCTEND, NULL)) {

		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL)) {

			info = "failed to unpack end of key, value data table";

			goto fail;

		}

	}



	if (!unpack_nameX(e, AA_STRUCTEND, NULL)) {

	if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL)) {

		info = "failed to unpack end of profile";

		goto fail;

	}
@@ -960,7 +934,7 @@ static int verify_header(struct aa_ext *e, int required, const char **ns) 
	*ns = NULL;



	/* get the interface version */

	if (!unpack_u32(e, &e->version, "version")) {

	if (!aa_unpack_u32(e, &e->version, "version")) {

		if (required) {

			audit_iface(NULL, NULL, NULL, "invalid profile format",

				    e, error);
@@ -979,7 +953,7 @@ static int verify_header(struct aa_ext *e, int required, const char **ns) 
	}



	/* read the namespace if present */

	if (unpack_str(e, &name, "namespace")) {

	if (aa_unpack_str(e, &name, "namespace")) {

		if (*name == '\0') {

			audit_iface(NULL, NULL, NULL, "invalid namespace name",

				    e, error);
@@ -1251,7 +1225,3 @@ int aa_unpack(struct aa_loaddata *udata, struct list_head *lh, 


	return error;

}
 


#ifdef CONFIG_SECURITY_APPARMOR_KUNIT_TEST

#include "policy_unpack_test.c"

#endif /* CONFIG_SECURITY_APPARMOR_KUNIT_TEST */

security/apparmor/policy_unpack_test.c

+37 −32

File changed.

Preview size limit exceeded, changes collapsed.