projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] support for context based audit filtering
[powerpc.git]
/
security
/
selinux
/
avc.c
diff --git
a/security/selinux/avc.c
b/security/selinux/avc.c
index
53d6c7b
..
a300702
100644
(file)
--- a/
security/selinux/avc.c
+++ b/
security/selinux/avc.c
@@
-43,13
+43,11
@@
static const struct av_perm_to_string
#undef S_
};
#undef S_
};
-#ifdef CONFIG_AUDIT
static const char *class_to_string[] = {
#define S_(s) s,
#include "class_to_string.h"
#undef S_
};
static const char *class_to_string[] = {
#define S_(s) s,
#include "class_to_string.h"
#undef S_
};
-#endif
#define TB_(s) static const char * s [] = {
#define TE_(s) };
#define TB_(s) static const char * s [] = {
#define TE_(s) };
@@
-802,7
+800,7
@@
out:
int avc_ss_reset(u32 seqno)
{
struct avc_callback_node *c;
int avc_ss_reset(u32 seqno)
{
struct avc_callback_node *c;
- int i, rc = 0;
+ int i, rc = 0
, tmprc
;
unsigned long flag;
struct avc_node *node;
unsigned long flag;
struct avc_node *node;
@@
-815,15
+813,16
@@
int avc_ss_reset(u32 seqno)
for (c = avc_callbacks; c; c = c->next) {
if (c->events & AVC_CALLBACK_RESET) {
for (c = avc_callbacks; c; c = c->next) {
if (c->events & AVC_CALLBACK_RESET) {
- rc = c->callback(AVC_CALLBACK_RESET,
- 0, 0, 0, 0, NULL);
- if (rc)
- goto out;
+ tmprc = c->callback(AVC_CALLBACK_RESET,
+ 0, 0, 0, 0, NULL);
+ /* save the first error encountered for the return
+ value and continue processing the callbacks */
+ if (!rc)
+ rc = tmprc;
}
}
avc_latest_notif_update(seqno, 0);
}
}
avc_latest_notif_update(seqno, 0);
-out:
return rc;
}
return rc;
}