git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
[pandora-kernel.git]
/
security
/
selinux
/
avc.c
diff --git
a/security/selinux/avc.c
b/security/selinux/avc.c
index
12e4fb7
..
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) };
@@
-494,8
+492,7
@@
static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
char *name1, char *name2)
{
if (!ipv6_addr_any(addr))
char *name1, char *name2)
{
if (!ipv6_addr_any(addr))
- audit_log_format(ab, " %s=%04x:%04x:%04x:%04x:%04x:"
- "%04x:%04x:%04x", name1, NIP6(*addr));
+ audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr));
if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port));
}
if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port));
}
@@
-504,7
+501,7
@@
static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr,
__be16 port, char *name1, char *name2)
{
if (addr)
__be16 port, char *name1, char *name2)
{
if (addr)
- audit_log_format(ab, " %s=
%d.%d.%d.%d"
, name1, NIPQUAD(addr));
+ audit_log_format(ab, " %s=
" NIPQUAD_FMT
, name1, NIPQUAD(addr));
if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port));
}
if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port));
}
@@
-803,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;
@@
-816,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;
}