diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-11 10:17:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-11 10:17:50 -0700 |
| commit | adf961d7e8006d2cb16ceee07582b145b9ef69f7 (patch) | |
| tree | d78fc69c64493cc688d4acd080352e81f2eda128 /include | |
| parent | x86: Remove CONFIG_X86_OOSTORE (diff) | |
| parent | audit: Update kdoc for audit_send_reply and audit_list_rules_send (diff) | |
| download | linux-dev-adf961d7e8006d2cb16ceee07582b145b9ef69f7.tar.xz linux-dev-adf961d7e8006d2cb16ceee07582b145b9ef69f7.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull audit namespace fixes from Eric Biederman:
"Starting with 3.14-rc1 the audit code is faulty (think oopses and
races) with respect to how it computes the network namespace of which
socket to reply to, and I happened to notice by chance when reading
through the code.
My testing and the automated build bots don't find any problems with
these fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
audit: Update kdoc for audit_send_reply and audit_list_rules_send
audit: Send replies in the proper network namespace.
audit: Use struct net not pid_t to remember the network namespce to reply in
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/audit.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index aa865a9a4c4f..ec1464df4c60 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -43,6 +43,7 @@ struct mq_attr; struct mqstat; struct audit_watch; struct audit_tree; +struct sk_buff; struct audit_krule { int vers_ops; @@ -463,7 +464,7 @@ extern int audit_filter_user(int type); extern int audit_filter_type(int type); extern int audit_rule_change(int type, __u32 portid, int seq, void *data, size_t datasz); -extern int audit_list_rules_send(__u32 portid, int seq); +extern int audit_list_rules_send(struct sk_buff *request_skb, int seq); extern u32 audit_enabled; #else /* CONFIG_AUDIT */ |