topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2025-02-23 21:01:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Stephen Smalley 2013-12-30 14:40:32 -05:00
commit 2ba1541f21
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libselinux/ChangeLog
View File

@ -1,3 +1,6 @@
2.2.2 2013-12-30
* Fix userspace AVC handling of per-domain permissive mode.
2.2.1 2013-11-06
* Remove -lpthread from pkg-config file; it is not required.

2
libselinux/VERSION
View File

@ -1 +1 @@
2.2.1
2.2.2

12
libselinux/src/avc.c
View File

@ -336,11 +336,7 @@ static inline struct avc_node *avc_reclaim_node(void)
static inline void avc_clear_avc_entry(struct avc_entry *ae)
{
ae->ssid = ae->tsid = ae->create_sid = NULL;
ae->tclass = 0;
ae->avd.allowed = ae->avd.decided = 0;
ae->avd.auditallow = ae->avd.auditdeny = 0;
ae->used = 0;
memset(ae, 0, sizeof(*ae));
}
static inline struct avc_node *avc_claim_node(security_id_t ssid,
@ -488,11 +484,7 @@ static int avc_insert(security_id_t ssid, security_id_t tsid,
goto out;
}
node->ae.avd.allowed = ae->avd.allowed;
node->ae.avd.decided = ae->avd.decided;
node->ae.avd.auditallow = ae->avd.auditallow;
node->ae.avd.auditdeny = ae->avd.auditdeny;
node->ae.avd.seqno = ae->avd.seqno;
memcpy(&node->ae.avd, &ae->avd, sizeof(ae->avd));
aeref->ae = &node->ae;
out:
return rc;