Merge 4.19.252 into android-4.19-stable
Changes in 4.19.252 esp: limit skb_page_frag_refill use to a single page mm/slub: add missing TID updates on slab deactivation can: bcm: use call_rcu() instead of costly synchronize_rcu() can: grcan: grcan_probe(): remove extra of_node_get() can: gs_usb: gs_usb_open/close(): fix memory leak usbnet: fix memory leak in error case net: rose: fix UAF bug caused by rose_t0timer_expiry iommu/vt-d: Fix PCI bus rescan device hot add fbcon: Disallow setting font bigger than screen size video: of_display_timing.h: include errno.h powerpc/powernv: delay rng platform device creation until later in boot can: kvaser_usb: replace run-time checks with struct kvaser_usb_driver_info can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits xfs: remove incorrect ASSERT in xfs_rename ARM: meson: Fix refcount leak in meson_smp_prepare_cpus pinctrl: sunxi: a83t: Fix NAND function name for some pins ARM: at91: pm: use proper compatible for sama5d2's rtc ibmvnic: Properly dispose of all skbs during a failover. selftests: forwarding: fix flood_unicast_test when h2 supports IFF_UNICAST_FLT selftests: forwarding: fix learning_test when h1 supports IFF_UNICAST_FLT selftests: forwarding: fix error message in learning_test i2c: cadence: Unregister the clk notifier in error path misc: rtsx_usb: fix use of dma mapped buffer for usb bulk transfer misc: rtsx_usb: use separate command and response buffers misc: rtsx_usb: set return value in rsp_buf alloc err path ida: don't use BUG_ON() for debugging dmaengine: pl330: Fix lockdep warning about non-static key dmaengine: at_xdma: handle errors of at_xdmac_alloc_desc() correctly dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate Linux 4.19.252 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I103a7ac70fedd38208d1d9adc2570adecf38b7db
This commit is contained in:
@@ -2191,6 +2191,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
|
||||
|
||||
c->page = NULL;
|
||||
c->freelist = NULL;
|
||||
c->tid = next_tid(c->tid);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -2324,8 +2325,6 @@ static inline void flush_slab(struct kmem_cache *s, struct kmem_cache_cpu *c)
|
||||
{
|
||||
stat(s, CPUSLAB_FLUSH);
|
||||
deactivate_slab(s, c->page, c->freelist, c);
|
||||
|
||||
c->tid = next_tid(c->tid);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -2612,6 +2611,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
|
||||
|
||||
if (!freelist) {
|
||||
c->page = NULL;
|
||||
c->tid = next_tid(c->tid);
|
||||
stat(s, DEACTIVATE_BYPASS);
|
||||
goto new_slab;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user