projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing: Fix enabling of syscall events on the command line
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
audit.c
diff --git
a/kernel/audit.c
b/kernel/audit.c
index f8f203e8018c5995b546457342d18f262a2565dc..72ab759a0b43a6400750cefa71650ed64e7a8222 100644
(file)
--- a/
kernel/audit.c
+++ b/
kernel/audit.c
@@
-429,7
+429,7
@@
static void kauditd_send_skb(struct sk_buff *skb)
* This function doesn't consume an skb as might be expected since it has to
* copy it anyways.
*/
* This function doesn't consume an skb as might be expected since it has to
* copy it anyways.
*/
-static void kauditd_send_multicast_skb(struct sk_buff *skb)
+static void kauditd_send_multicast_skb(struct sk_buff *skb
, gfp_t gfp_mask
)
{
struct sk_buff *copy;
struct audit_net *aunet = net_generic(&init_net, audit_net_id);
{
struct sk_buff *copy;
struct audit_net *aunet = net_generic(&init_net, audit_net_id);
@@
-448,11
+448,11
@@
static void kauditd_send_multicast_skb(struct sk_buff *skb)
* no reason for new multicast clients to continue with this
* non-compliance.
*/
* no reason for new multicast clients to continue with this
* non-compliance.
*/
- copy = skb_copy(skb,
GFP_KERNEL
);
+ copy = skb_copy(skb,
gfp_mask
);
if (!copy)
return;
if (!copy)
return;
- nlmsg_multicast(sock, copy, 0, AUDIT_NLGRP_READLOG,
GFP_KERNEL
);
+ nlmsg_multicast(sock, copy, 0, AUDIT_NLGRP_READLOG,
gfp_mask
);
}
/*
}
/*
@@
-1100,7
+1100,7
@@
static void audit_receive(struct sk_buff *skb)
}
/* Run custom bind function on netlink socket group connect or bind requests. */
}
/* Run custom bind function on netlink socket group connect or bind requests. */
-static int audit_bind(int group)
+static int audit_bind(
struct net *net,
int group)
{
if (!capable(CAP_AUDIT_READ))
return -EPERM;
{
if (!capable(CAP_AUDIT_READ))
return -EPERM;
@@
-1940,7
+1940,7
@@
void audit_log_end(struct audit_buffer *ab)
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
nlh->nlmsg_len = ab->skb->len;
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
nlh->nlmsg_len = ab->skb->len;
- kauditd_send_multicast_skb(ab->skb);
+ kauditd_send_multicast_skb(ab->skb
, ab->gfp_mask
);
/*
* The original kaudit unicast socket sends up messages with
/*
* The original kaudit unicast socket sends up messages with