GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 14:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

audit: replace obsolete NLMSG_* with type safe nlmsg_*

Browse source 
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hong zhi guo 2013-03-27 06:49:06 +00:00 • committed by David S. Miller
parent 573ce260b3
commit 9419121330
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/audit.c
View file

@ -58,7 +58,7 @@
#ifdef CONFIG_SECURITY #ifdef CONFIG_SECURITY
#include <linux/security.h> #include <linux/security.h>
#endif #endif
#include <linux/netlink.h> #include <net/netlink.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/pid_namespace.h> #include <linux/pid_namespace.h>
@ -910,7 +910,7 @@ static void audit_receive_skb(struct sk_buff *skb)
{ {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
/* /*
* len MUST be signed for NLMSG_NEXT to be able to dec it below 0 * len MUST be signed for nlmsg_next to be able to dec it below 0
* if the nlmsg_len was not aligned * if the nlmsg_len was not aligned
*/ */
int len; int len;
@ -919,13 +919,13 @@ static void audit_receive_skb(struct sk_buff *skb)
nlh = nlmsg_hdr(skb); nlh = nlmsg_hdr(skb);
len = skb->len; len = skb->len;
while (NLMSG_OK(nlh, len)) { while (nlmsg_ok(nlh, len)) {
err = audit_receive_msg(skb, nlh); err = audit_receive_msg(skb, nlh);
/* if err or if this message says it wants a response */ /* if err or if this message says it wants a response */
if (err || (nlh->nlmsg_flags & NLM_F_ACK)) if (err || (nlh->nlmsg_flags & NLM_F_ACK))
netlink_ack(skb, nlh, err); netlink_ack(skb, nlh, err);
nlh = NLMSG_NEXT(nlh, len); nlh = nlmsg_next(nlh, len);
} }
} }
@ -1483,7 +1483,7 @@ void audit_log_end(struct audit_buffer *ab)
audit_log_lost("rate limit exceeded"); audit_log_lost("rate limit exceeded");
} else { } else {
struct nlmsghdr *nlh = nlmsg_hdr(ab->skb); struct nlmsghdr *nlh = nlmsg_hdr(ab->skb);
nlh->nlmsg_len = ab->skb->len - NLMSG_SPACE(0); nlh->nlmsg_len = ab->skb->len - NLMSG_HDRLEN;
if (audit_pid) { if (audit_pid) {
skb_queue_tail(&audit_skb_queue, ab->skb); skb_queue_tail(&audit_skb_queue, ab->skb);