Skip to content

Commit

Permalink
audit: fix a net reference leak in audit_list_rules_send()
Browse files Browse the repository at this point in the history
commit 3054d06 upstream.

If audit_list_rules_send() fails when trying to create a new thread
to send the rules it also fails to cleanup properly, leaking a
reference to a net structure.  This patch fixes the error patch and
renames audit_send_list() to audit_send_list_thread() to better
match its cousin, audit_send_reply_thread().

Reported-by: teroincn@gmail.com
Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Cc: <stable@vger.kernel.org> # 4.9.x
Signed-off-by: Wen Yang <wenyang@linux.alibaba.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Paul Moore authored and Greg Kroah-Hartman committed Apr 7, 2021
1 parent 61ec5d8 commit 249293b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion kernel/audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ static int kauditd_thread(void *dummy)
return 0;
}

int audit_send_list(void *_dest)
int audit_send_list_thread(void *_dest)
{
struct audit_netlink_list *dest = _dest;
struct sk_buff *skb;
Expand Down
2 changes: 1 addition & 1 deletion kernel/audit.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ struct audit_netlink_list {
struct sk_buff_head q;
};

int audit_send_list(void *);
int audit_send_list_thread(void *);

struct audit_net {
struct sock *nlsk;
Expand Down
13 changes: 6 additions & 7 deletions kernel/auditfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1139,36 +1139,35 @@ int audit_rule_change(int type, __u32 portid, int seq, void *data,
int audit_list_rules_send(struct sk_buff *request_skb, int seq)
{
u32 portid = NETLINK_CB(request_skb).portid;
struct net *net = sock_net(NETLINK_CB(request_skb).sk);
struct task_struct *tsk;
struct audit_netlink_list *dest;
int err = 0;

/* We can't just spew out the rules here because we might fill
* the available socket buffer space and deadlock waiting for
* auditctl to read from it... which isn't ever going to
* happen if we're actually running in the context of auditctl
* trying to _send_ the stuff */

dest = kmalloc(sizeof(struct audit_netlink_list), GFP_KERNEL);
dest = kmalloc(sizeof(*dest), GFP_KERNEL);
if (!dest)
return -ENOMEM;
dest->net = get_net(net);
dest->net = get_net(sock_net(NETLINK_CB(request_skb).sk));
dest->portid = portid;
skb_queue_head_init(&dest->q);

mutex_lock(&audit_filter_mutex);
audit_list_rules(portid, seq, &dest->q);
mutex_unlock(&audit_filter_mutex);

tsk = kthread_run(audit_send_list, dest, "audit_send_list");
tsk = kthread_run(audit_send_list_thread, dest, "audit_send_list");
if (IS_ERR(tsk)) {
skb_queue_purge(&dest->q);
put_net(dest->net);
kfree(dest);
err = PTR_ERR(tsk);
return PTR_ERR(tsk);
}

return err;
return 0;
}

int audit_comparator(u32 left, u32 op, u32 right)
Expand Down

0 comments on commit 249293b

Please sign in to comment.