Skip to content

Commit 4f94b88

Browse files
committed
Merge 4.19.324 into android-4.19-stable
Changes in 4.19.324 arm64: dts: rockchip: Fix rt5651 compatible value on rk3399-sapphire-excavator ARM: dts: rockchip: fix rk3036 acodec node ARM: dts: rockchip: drop grf reference from rk3036 hdmi ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin HID: core: zero-initialize the report buffer security/keys: fix slab-out-of-bounds in key_task_permission sctp: properly validate chunk size in sctp_sf_ootb() can: c_can: fix {rx,tx}_errors statistics net: hns3: fix kernel crash when uninstalling driver media: stb0899_algo: initialize cfr before using it media: dvbdev: prevent the risk of out of memory access media: dvb_frontend: don't play tricks with underflow values media: adv7604: prevent underflow condition when reporting colorspace ALSA: firewire-lib: fix return value on fail in amdtp_tscm_init() media: s5p-jpeg: prevent buffer overflows media: cx24116: prevent overflows on SNR calculus media: v4l2-tpg: prevent the risk of a division by zero drm/amdgpu: add missing size check in amdgpu_debugfs_gprwave_read() drm/amdgpu: prevent NULL pointer dereference if ATIF is not supported dm cache: correct the number of origin blocks to match the target length dm cache: fix out-of-bounds access to the dirty bitset when resizing dm cache: optimize dirty bit checking with find_next_bit when resizing dm cache: fix potential out-of-bounds access on the first resume dm-unstriped: cast an operand to sector_t to prevent potential uint32_t overflow nfs: Fix KMSAN warning in decode_getfattr_attrs() btrfs: reinitialize delayed ref list after deleting it from the list bonding (gcc13): synchronize bond_{a,t}lb_xmit() types net: bridge: xmit: make sure we have at least eth header len bytes media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format fs/proc: fix compile warning about variable 'vmcore_mmap_ops' usb: musb: sunxi: Fix accessing an released usb phy USB: serial: io_edgeport: fix use after free in debug printk USB: serial: qcserial: add support for Sierra Wireless EM86xx USB: serial: option: add Fibocom FG132 0x0112 composition USB: serial: option: add Quectel RG650V irqchip/gic-v3: Force propagation of the active state with a read-back ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove() ALSA: pcm: Return 0 when size < start_threshold in capture ALSA: usb-audio: Add custom mixer status quirks for RME CC devices ALSA: usb-audio: Support jack detection on Dell dock ALSA: usb-audio: Add quirks for Dell WD19 dock hv_sock: Initializing vsk->trans to NULL to prevent a dangling pointer vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans ALSA: usb-audio: Add endianness annotations 9p: Avoid creating multiple slab caches with the same name HID: multitouch: Add quirk for HONOR MagicBook Art 14 touchpad bpf: use kvzmalloc to allocate BPF verifier environment sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML powerpc/powernv: Free name on error in opal_event_init() fs: Fix uninitialized value issue in from_kuid and from_kgid net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition 9p: fix slab cache name creation for real Linux 4.19.324 Change-Id: Ib8e7c89304d2c2cc72aea03446ea40a8704b41ec Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2 parents 2d76dea + 708f578 commit 4f94b88

44 files changed

Lines changed: 725 additions & 88 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 19
4-
SUBLEVEL = 323
4+
SUBLEVEL = 324
55
EXTRAVERSION =
66
NAME = "People's Front"
77

arch/arm/boot/dts/rk3036-kylin.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@
300300
&i2c2 {
301301
status = "okay";
302302

303-
rt5616: rt5616@1b {
304-
compatible = "rt5616";
303+
rt5616: audio-codec@1b {
304+
compatible = "realtek,rt5616";
305305
reg = <0x1b>;
306306
clocks = <&cru SCLK_I2S_OUT>;
307307
clock-names = "mclk";

arch/arm/boot/dts/rk3036.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,13 @@
316316
};
317317
};
318318

319-
acodec: acodec-ana@20030000 {
320-
compatible = "rk3036-codec";
319+
acodec: audio-codec@20030000 {
320+
compatible = "rockchip,rk3036-codec";
321321
reg = <0x20030000 0x4000>;
322-
rockchip,grf = <&grf>;
323322
clock-names = "acodec_pclk";
324323
clocks = <&cru PCLK_ACODEC>;
324+
rockchip,grf = <&grf>;
325+
#sound-dai-cells = <0>;
325326
status = "disabled";
326327
};
327328

@@ -331,7 +332,6 @@
331332
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
332333
clocks = <&cru PCLK_HDMI>;
333334
clock-names = "pclk";
334-
rockchip,grf = <&grf>;
335335
pinctrl-names = "default";
336336
pinctrl-0 = <&hdmi_ctl>;
337337
status = "disabled";

arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
status = "okay";
124124

125125
rt5651: rt5651@1a {
126-
compatible = "rockchip,rt5651";
126+
compatible = "realtek,rt5651";
127127
reg = <0x1a>;
128128
clocks = <&cru SCLK_I2S_8CH_OUT>;
129129
clock-names = "mclk";

arch/powerpc/platforms/powernv/opal-irqchip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ int __init opal_event_init(void)
289289
name, NULL);
290290
if (rc) {
291291
pr_warn("Error %d requesting OPAL irq %d\n", rc, (int)r->start);
292+
kfree(name);
292293
continue;
293294
}
294295
}

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
115115
&buffer);
116116
obj = (union acpi_object *)buffer.pointer;
117117

118-
/* Fail if calling the method fails and ATIF is supported */
119-
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
118+
/* Fail if calling the method fails */
119+
if (ACPI_FAILURE(status)) {
120120
DRM_DEBUG_DRIVER("failed to evaluate ATIF got %s\n",
121121
acpi_format_exception(status));
122122
kfree(obj);

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,
394394
if (!adev->smc_rreg)
395395
return -EOPNOTSUPP;
396396

397-
if (size & 0x3 || *pos & 0x3)
397+
if (size > 4096 || size & 0x3 || *pos & 0x3)
398398
return -EINVAL;
399399

400400
while (size) {

drivers/hid/hid-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ u8 *hid_alloc_report_buf(struct hid_report *report, gfp_t flags)
14821482

14831483
u32 len = hid_report_len(report) + 7;
14841484

1485-
return kmalloc(len, flags);
1485+
return kzalloc(len, flags);
14861486
}
14871487
EXPORT_SYMBOL_GPL(hid_alloc_report_buf);
14881488

drivers/hid/hid-multitouch.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,6 +1986,11 @@ static const struct hid_device_id mt_devices[] = {
19861986
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
19871987
0x347d, 0x7853) },
19881988

1989+
/* HONOR MagicBook Art 14 touchpad */
1990+
{ .driver_data = MT_CLS_VTL,
1991+
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
1992+
0x35cc, 0x0104) },
1993+
19891994
/* Ilitek dual touch panel */
19901995
{ .driver_data = MT_CLS_NSMU,
19911996
MT_USB_DEVICE(USB_VENDOR_ID_ILITEK,

drivers/irqchip/irq-gic-v3.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,13 @@ static int gic_irq_set_irqchip_state(struct irq_data *d,
254254
}
255255

256256
gic_poke_irq(d, reg);
257+
258+
/*
259+
* Force read-back to guarantee that the active state has taken
260+
* effect, and won't race with a guest-driven deactivation.
261+
*/
262+
if (reg == GICD_ISACTIVER)
263+
gic_peek_irq(d, reg);
257264
return 0;
258265
}
259266

0 commit comments

Comments
 (0)