audit: replace obsolete NLMSG_* with type safe nlmsg_*
Subsystems (3)
PATCH 2/6 audit: replace obsolete NLMSG_* with type safe nlmsg_*
Signed-off-by Hong Zhiguo <[email protected]>
--- kernel/audit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/audit.c +5 -5
@@ -58,7 +58,7 @@#ifdef CONFIG_SECURITY #include <linux/security.h> #endif -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/freezer.h> #include <linux/tty.h> #include <linux/pid_namespace.h>
@@ -910,7 +910,7 @@ static void audit_receive_skb(struct sk_buff *skb) {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 */ int len;
@@ -919,13 +919,13 @@ static void audit_receive_skb(struct sk_buff *skb) nlh =nlmsg_hdr (skb); len = skb->len; -while (NLMSG_OK (nlh, len)) { +while (nlmsg_ok (nlh, len)) { err =audit_receive_msg (skb, nlh);/* if err or if this message says it wants a response */ if (err || (nlh->nlmsg_flags &NLM_F_ACK ))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" ); }else {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) {skb_queue_tail (&audit_skb_queue, ab->skb);
Signature · 1 line
1.7.10.4
Quoted 1 line · Hong Zhiguo
Signed-off-by Hong Zhiguo <[email protected]>
Acked-by Thomas Graf <[email protected]>
From: Hong Zhiguo <[email protected]>
Date: Thu, 28 Mar 2013 00:49:06 +0800
Quoted 1 line
Signed-off-by Hong Zhiguo <[email protected]>
Applied.
Quoted 10 lines · Hong Zhiguo
Signed-off-by Hong Zhiguo <[email protected]>--- kernel/audit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)kernel/audit.c +0
-0
kernel/audit.c line 61
Quoted 5 lines
kernel/audit.c +1
-1@@ -58,7 +58,7 @@#ifdef CONFIG_SECURITY #include <linux/security.h> #endif -#include <linux/netlink.h> +#include <net/netlink.h>
This is a duplicate include. We already included net/netlink.h a couple of lines above. We use netlink_unicast, which comes from linux/netlink.h. I recognize that it comes in from net/netlink.h, but I thought it good practice to pull it in ourselves. Should I send a separate patch to revert back to linux/netlink.h or a patch to just remove the include altogether?
-Eric
Quoted 44 lines
kernel/audit.c +4
-5#include <linux/freezer.h> #include <linux/tty.h> #include <linux/pid_namespace.h> @@ -910,7 +910,7 @@ static void audit_receive_skb(struct sk_buff *skb) {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 */ int len;@@ -919,13 +919,13 @@ static void audit_receive_skb(struct sk_buff *skb) nlh =nlmsg_hdr (skb); len = skb->len; -while (NLMSG_OK (nlh, len)) { +while (nlmsg_ok (nlh, len)) { err =audit_receive_msg (skb, nlh);/* if err or if this message says it wants a response */ if (err || (nlh->nlmsg_flags &NLM_F_ACK ))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" ); }else {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) {skb_queue_tail (&audit_skb_queue, ab->skb); --1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html