Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f3da83 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.30 (4afd5971) into msm-4.19 



* refs/heads/tmp-4afd5971:
  Linux 4.19.30
  vhost/vsock: fix vhost vsock cid hashing inconsistent
  i40e: report correct statistics when XDP is enabled
  staging: erofs: fix race when the managed cache is enabled
  drm: Block fb changes for async plane updates
  It's wrong to add len to sector_nr in raid10 reshape twice
  perf/x86/intel: Make dev_attr_allow_tsx_force_abort static
  perf/x86/intel: Fix memory corruption
  ALSA: hda/realtek: Enable headset MIC of Acer TravelMate X514-51T with ALC255
  ALSA: hda/realtek - Reduce click noise on Dell Precision 5820 headphone
  ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with ALC294
  ALSA: hda - add more quirks for HP Z2 G4 and HP Z240
  ALSA: hda: Extend i915 component bind timeout
  ALSA: firewire-motu: fix construction of PCM frame for capture direction
  ALSA: bebob: use more identical mod_alias for Saffire Pro 10 I/O against Liquid Saffire 56
  perf/x86: Fixup typo in stub functions
  f2fs: wait on atomic writes to count F2FS_CP_WB_DATA
  net: sched: flower: insert new filter to idr after setting its mask
  missing barriers in some of unix_sock ->addr and ->path accesses
  net/smc: fix smc_poll in SMC_INIT state
  bonding: fix PACKET_ORIGDEV regression
  ipv6: route: enforce RCU protection in ip6_route_check_nh_onlink()
  ipv6: route: enforce RCU protection in rt6_update_exception_stamp_rt()
  ipvlan: disallow userns cap_net_admin to change global mode/flags
  team: use operstate consistently for linkup
  ipv6: route: purge exception on removal
  net: Set rtm_table to RT_TABLE_COMPAT for ipv6 for tables > 255
  mdio_bus: Fix use-after-free on device_register fails
  net/x25: fix a race in x25_bind()
  net/mlx4_core: Fix qp mtt size calculation
  net/mlx4_core: Fix locking in SRIOV mode when switching between events and polling
  net/mlx4_core: Fix reset flow when in command polling mode
  vxlan: test dev->flags & IFF_UP before calling gro_cells_receive()
  vxlan: Fix GRO cells race condition between receive and link delete
  tcp: handle inet_csk_reqsk_queue_add() failures
  tcp: Don't access TCP_SKB_CB before initializing it
  tcp: do not report TCP_CM_INQ of 0 for closed connections
  sctp: remove sched init from sctp_stream_init
  rxrpc: Fix client call queueing, waiting for channel
  route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to fix a race
  ravb: Decrease TxFIFO depth of Q3 and Q2 to one
  pptp: dst_release sk_dst_cache in pptp_sock_destruct
  net/x25: reset state in x25_connect()
  net/x25: fix use-after-free in x25_device_event()
  net: sit: fix UBSAN Undefined behaviour in check_6rd
  net/hsr: fix possible crash in add_timer()
  net: hsr: fix memory leak in hsr_dev_finalize()
  lan743x: Fix TX Stall Issue
  lan743x: Fix RX Kernel Panic
  l2tp: fix infoleak in l2tp_ip6_recvmsg()
  ipv4/route: fail early when inet dev is missing
  gro_cells: make sure device is up in gro_cells_receive()
  connector: fix unsafe usage of ->real_parent

Change-Id: Id10a55e5ecae0543594b663c5a10aac33538de48
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents fb80045f 4afd5971

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 29

SUBLEVEL = 30

EXTRAVERSION =

NAME = "People's Front"

arch/x86/events/intel/core.c

+2 −2
Original line number Diff line number Diff line
@@ -3282,7 +3282,7 @@ tfa_get_event_constraints(struct cpu_hw_events *cpuc, int idx, 
	/*

	 * Without TFA we must not use PMC3.

	 */

	if (!allow_tsx_force_abort && test_bit(3, c->idxmsk)) {

	if (!allow_tsx_force_abort && test_bit(3, c->idxmsk) && idx >= 0) {

		c = dyn_constraint(cpuc, c, idx);

		c->idxmsk64 &= ~(1ULL << 3);

		c->weight--;
@@ -3989,7 +3989,7 @@ static struct attribute *intel_pmu_caps_attrs[] = { 
       NULL

};



DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);

static DEVICE_BOOL_ATTR(allow_tsx_force_abort, 0644, allow_tsx_force_abort);



static struct attribute *intel_pmu_attrs[] = {

	&dev_attr_freeze_on_smi.attr,

arch/x86/events/perf_event.h

+2 −2
Original line number Diff line number Diff line
@@ -1030,12 +1030,12 @@ static inline int intel_pmu_init(void) 
	return 0;

}



static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu)

static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)

{

	return 0;

}



static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc)

static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc)

{

}

drivers/connector/cn_proc.c

+18 −4
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ void proc_coredump_connector(struct task_struct *task) 
{

	struct cn_msg *msg;

	struct proc_event *ev;

	struct task_struct *parent;

	__u8 buffer[CN_PROC_MSG_SIZE] __aligned(8);



	if (atomic_read(&proc_event_num_listeners) < 1)
@@ -262,8 +263,14 @@ void proc_coredump_connector(struct task_struct *task) 
	ev->what = PROC_EVENT_COREDUMP;

	ev->event_data.coredump.process_pid = task->pid;

	ev->event_data.coredump.process_tgid = task->tgid;

	ev->event_data.coredump.parent_pid = task->real_parent->pid;

	ev->event_data.coredump.parent_tgid = task->real_parent->tgid;



	rcu_read_lock();

	if (pid_alive(task)) {

		parent = rcu_dereference(task->real_parent);

		ev->event_data.coredump.parent_pid = parent->pid;

		ev->event_data.coredump.parent_tgid = parent->tgid;

	}

	rcu_read_unlock();



	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */
@@ -276,6 +283,7 @@ void proc_exit_connector(struct task_struct *task) 
{

	struct cn_msg *msg;

	struct proc_event *ev;

	struct task_struct *parent;

	__u8 buffer[CN_PROC_MSG_SIZE] __aligned(8);



	if (atomic_read(&proc_event_num_listeners) < 1)
@@ -290,8 +298,14 @@ void proc_exit_connector(struct task_struct *task) 
	ev->event_data.exit.process_tgid = task->tgid;

	ev->event_data.exit.exit_code = task->exit_code;

	ev->event_data.exit.exit_signal = task->exit_signal;

	ev->event_data.exit.parent_pid = task->real_parent->pid;

	ev->event_data.exit.parent_tgid = task->real_parent->tgid;



	rcu_read_lock();

	if (pid_alive(task)) {

		parent = rcu_dereference(task->real_parent);

		ev->event_data.exit.parent_pid = parent->pid;

		ev->event_data.exit.parent_tgid = parent->tgid;

	}

	rcu_read_unlock();



	memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));

	msg->ack = 0; /* not used */

drivers/gpu/drm/drm_atomic_helper.c

+9 −0
Original line number Diff line number Diff line
@@ -1573,6 +1573,15 @@ int drm_atomic_helper_async_check(struct drm_device *dev, 
	if (old_plane_state->fb != new_plane_state->fb)

		return -EINVAL;



	/*

	 * FIXME: Since prepare_fb and cleanup_fb are always called on

	 * the new_plane_state for async updates we need to block framebuffer

	 * changes. This prevents use of a fb that's been cleaned up and

	 * double cleanups from occuring.

	 */

	if (old_plane_state->fb != new_plane_state->fb)

		return -EINVAL;



	funcs = plane->helper_private;

	if (!funcs->atomic_async_update)

		return -EINVAL;