projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[deliverable/linux.git]
/
kernel
/
audit.c
diff --git
a/kernel/audit.c
b/kernel/audit.c
index 8d528f9930dad639c22c797da715545db717ce6e..a8a91bd2b2a9b68696ca7b9b5916d49891992922 100644
(file)
--- a/
kernel/audit.c
+++ b/
kernel/audit.c
@@
-932,7
+932,7
@@
static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
if (!audit_enabled && msg_type != AUDIT_USER_AVC)
return 0;
if (!audit_enabled && msg_type != AUDIT_USER_AVC)
return 0;
- err = audit_filter
_user(msg_type
);
+ err = audit_filter
(msg_type, AUDIT_FILTER_USER
);
if (err == 1) { /* match or error */
err = 0;
if (msg_type == AUDIT_USER_TTY) {
if (err == 1) { /* match or error */
err = 0;
if (msg_type == AUDIT_USER_TTY) {
@@
-1379,7
+1379,7
@@
struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
if (audit_initialized != AUDIT_INITIALIZED)
return NULL;
if (audit_initialized != AUDIT_INITIALIZED)
return NULL;
- if (unlikely(
audit_filter_type(type
)))
+ if (unlikely(
!audit_filter(type, AUDIT_FILTER_TYPE
)))
return NULL;
if (gfp_mask & __GFP_DIRECT_RECLAIM) {
return NULL;
if (gfp_mask & __GFP_DIRECT_RECLAIM) {
This page took
0.025929 seconds
and
5
git commands to generate.