The second argument "type" is not used in audit_filter_user(), so I think that
type can be removed. If I'm wrong, please tell me.
Signed-off-by: Peng Haitao <penght(a)cn.fujitsu.com>
---
include/linux/audit.h | 2 +-
kernel/audit.c | 2 +-
kernel/auditfilter.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 2af9ec0..018f143 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -537,7 +537,7 @@ extern void audit_log_d_path(struct audit_buffer *ab,
struct path *path);
extern void audit_log_lost(const char *message);
/* Private API (for audit.c only) */
-extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
+extern int audit_filter_user(struct netlink_skb_parms *cb);
extern int audit_filter_type(int type);
extern int audit_receive_filter(int type, int pid, int uid, int seq,
void *data, size_t datasz, uid_t loginuid, u32 sid);
diff --git a/kernel/audit.c b/kernel/audit.c
index b782b04..136e559 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -645,7 +645,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr
*nlh)
if (!audit_enabled && msg_type != AUDIT_USER_AVC)
return 0;
- err = audit_filter_user(&NETLINK_CB(skb), msg_type);
+ err = audit_filter_user(&NETLINK_CB(skb));
if (err == 1) {
err = 0;
if (msg_type == AUDIT_USER_TTY) {
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 2f2914b..46337f2 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -1714,7 +1714,7 @@ static int audit_filter_user_rules(struct netlink_skb_parms *cb,
return 1;
}
-int audit_filter_user(struct netlink_skb_parms *cb, int type)
+int audit_filter_user(struct netlink_skb_parms *cb)
{
enum audit_state state = AUDIT_DISABLED;
struct audit_entry *e;
--
1.5.3
--
Regards
Peng Haitao