diff options
| author | David S. Miller <[email protected]> | 2016-05-10 04:50:20 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-05-10 04:50:20 +0000 |
| commit | adc0a8bfdc52cbbfe76730b166a17cb0d5cbc0f4 (patch) | |
| tree | 2e36817cdefc4a23667475f6c2f3c48d0bea358e /net/unix/af_unix.c | |
| parent | net: thunderx: avoid exposing kernel stack (diff) | |
| parent | netfilter: nfnetlink_acct: validate NFACCT_QUOTA parameter (diff) | |
| download | kernel-adc0a8bfdc52cbbfe76730b166a17cb0d5cbc0f4.tar.gz kernel-adc0a8bfdc52cbbfe76730b166a17cb0d5cbc0f4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contain Netfilter simple fixes for your net tree,
two one-liner and one two-liner:
1) Oneliner to fix missing spinlock definition that triggers
'BUG: spinlock bad magic on CPU#' when spinlock debugging is enabled,
from Florian Westphal.
2) Fix missing workqueue cancelation on IDLETIMER removal,
from Liping Zhang.
3) Fix insufficient validation of netlink of NFACCT_QUOTA in
nfnetlink_acct, from Phil Turnbull.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions