diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2017-05-08 09:55:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2017-05-08 09:55:31 +0200 |
| commit | 9796ea8fa00e6e664c846c40f6a14b4c227c1bdc (patch) | |
| tree | 450c1c87159f1473cfc8d3e9bc23d3f8ad6f424f /net | |
| parent | cc756e682c1a296acd14471d122646c92f6936f3 (diff) | |
| parent | dec1dc2a0ee8e929c12360c01f211daad862e96c (diff) | |
Merge 4.4.67 into android-4.4
Changes in 4.4.67:
timerfd: Protect the might cancel mechanism proper
Handle mismatched open calls
ASoC: intel: Fix PM and non-atomic crash in bytcr drivers
ALSA: ppc/awacs: shut up maybe-uninitialized warning
drbd: avoid redefinition of BITS_PER_PAGE
mtd: avoid stack overflow in MTD CFI code
net: tg3: avoid uninitialized variable warning
scsi: cxlflash: Scan host only after the port is ready for I/O
scsi: cxlflash: Fix to avoid EEH and host reset collisions
scsi: cxlflash: Improve EEH recovery time
8250_pci: Fix potential use-after-free in error path
netlink: Allow direct reclaim for fallback allocation
IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE
IB/ehca: fix maybe-uninitialized warnings
ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY
ext4 crypto: revalidate dentry after adding or removing the key
ext4 crypto: use dget_parent() in ext4_d_revalidate()
ext4/fscrypto: avoid RCU lookup in d_revalidate
nfsd4: minor NFSv2/v3 write decoding cleanup
nfsd: stricter decoding of write-like NFSv2/v3 ops
dm ioctl: prevent stack leak in dm ioctl call
Linux 4.4.67
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 8e33019d8e7b..acfb16fdcd55 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2107,7 +2107,7 @@ static int netlink_dump(struct sock *sk) if (!skb) { alloc_size = alloc_min_size; skb = netlink_alloc_skb(sk, alloc_size, nlk->portid, - (GFP_KERNEL & ~__GFP_DIRECT_RECLAIM)); + GFP_KERNEL); } if (!skb) goto errout_skb; |