Commit 121d4a91 authored by John Johansen's avatar John Johansen
Browse files

apparmor: rename sid to secid 



Move to common terminology with other LSMs and kernel infrastucture

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 98849dff

security/apparmor/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o 


apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \

              path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \

              resource.o sid.o file.o policy_ns.o

              resource.o secid.o file.o policy_ns.o

apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o



clean-files := capability_names.h rlim_names.h

security/apparmor/include/sid.h→security/apparmor/include/secid.h

+9 −9
Original line number Diff line number Diff line 
/*

 * AppArmor security module

 *

 * This file contains AppArmor security identifier (sid) definitions

 * This file contains AppArmor security identifier (secid) definitions

 *

 * Copyright 2009-2010 Canonical Ltd.

 *
@@ -11,16 +11,16 @@ 
 * License.

 */



#ifndef __AA_SID_H

#define __AA_SID_H

#ifndef __AA_SECID_H

#define __AA_SECID_H



#include <linux/types.h>



/* sid value that will not be allocated */

#define AA_SID_INVALID 0

#define AA_SID_ALLOC AA_SID_INVALID

/* secid value that will not be allocated */

#define AA_SECID_INVALID 0

#define AA_SECID_ALLOC AA_SECID_INVALID



u32 aa_alloc_sid(void);

void aa_free_sid(u32 sid);

u32 aa_alloc_secid(void);

void aa_free_secid(u32 secid);



#endif /* __AA_SID_H */
 
#endif /* __AA_SECID_H */

security/apparmor/sid.c→security/apparmor/secid.c

+55 −0
Original line number Diff line number Diff line 
/*

 * AppArmor security module

 *

 * This file contains AppArmor security identifier (sid) manipulation fns

 * This file contains AppArmor security identifier (secid) manipulation fns

 *

 * Copyright 2009-2010 Canonical Ltd.

 *
@@ -11,45 +11,45 @@ 
 * License.

 *

 *

 * AppArmor allocates a unique sid for every profile loaded.  If a profile

 * is replaced it receives the sid of the profile it is replacing.

 * AppArmor allocates a unique secid for every profile loaded.  If a profile

 * is replaced it receives the secid of the profile it is replacing.

 *

 * The sid value of 0 is invalid.

 * The secid value of 0 is invalid.

 */



#include <linux/spinlock.h>

#include <linux/errno.h>

#include <linux/err.h>



#include "include/sid.h"

#include "include/secid.h"



/* global counter from which sids are allocated */

static u32 global_sid;

static DEFINE_SPINLOCK(sid_lock);

/* global counter from which secids are allocated */

static u32 global_secid;

static DEFINE_SPINLOCK(secid_lock);



/* TODO FIXME: add sid to profile mapping, and sid recycling */

/* TODO FIXME: add secid to profile mapping, and secid recycling */



/**

 * aa_alloc_sid - allocate a new sid for a profile

 * aa_alloc_secid - allocate a new secid for a profile

 */

u32 aa_alloc_sid(void)

u32 aa_alloc_secid(void)

{

	u32 sid;

	u32 secid;



	/*

	 * TODO FIXME: sid recycling - part of profile mapping table

	 * TODO FIXME: secid recycling - part of profile mapping table

	 */

	spin_lock(&sid_lock);

	sid = (++global_sid);

	spin_unlock(&sid_lock);

	return sid;

	spin_lock(&secid_lock);

	secid = (++global_secid);

	spin_unlock(&secid_lock);

	return secid;

}



/**

 * aa_free_sid - free a sid

 * @sid: sid to free

 * aa_free_secid - free a secid

 * @secid: secid to free

 */

void aa_free_sid(u32 sid)

void aa_free_secid(u32 secid)

{

	;			/* NOP ATM */

}