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 /kernel/audit.h | |
| parent | 09df7c4c8097ca4a11393b1edd4997d786daad52 (diff) | |
| parent | d211f177b28ec070c25b3d0b960aa55f352f731f (diff) | |
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 'kernel/audit.h')
| -rw-r--r-- | kernel/audit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index 57cc64d67718..8df132214606 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -247,7 +247,7 @@ extern void audit_panic(const char *message); struct audit_netlink_list { __u32 portid; - pid_t pid; + struct net *net; struct sk_buff_head q; }; |