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

Commit 46155cc7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.132 into android-4.4 



Changes in 4.4.132
	perf/core: Fix the perf_cpu_time_max_percent check
	bpf: map_get_next_key to return first key on NULL
	KVM: s390: Enable all facility bits that are known good for passthrough
	percpu: include linux/sched.h for cond_resched()
	mac80211: allow not sending MIC up from driver for HW crypto
	mac80211: allow same PN for AMSDU sub-frames
	mac80211: Add RX flag to indicate ICV stripped
	ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode
	ath10k: rebuild crypto header in rx data frames
	gpmi-nand: Handle ECC Errors in erased pages
	USB: serial: option: Add support for Quectel EP06
	ALSA: pcm: Check PCM state at xfern compat ioctl
	ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger()
	ALSA: aloop: Mark paused device as inactive
	ALSA: aloop: Add missing cable lock to ctl API callbacks
	tracepoint: Do not warn on ENOMEM
	Input: leds - fix out of bound access
	Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro
	xfs: prevent creating negative-sized file via INSERT_RANGE
	RDMA/ucma: Allow resolving address w/o specifying source address
	RDMA/mlx5: Protect from shift operand overflow
	NET: usb: qmi_wwan: add support for ublox R410M PID 0x90b2
	IB/mlx5: Use unlimited rate when static rate is not supported
	drm/vmwgfx: Fix a buffer object leak
	test_firmware: fix setting old custom fw path back on exit, second try
	USB: serial: visor: handle potential invalid device configuration
	USB: Accept bulk endpoints with 1024-byte maxpacket
	USB: serial: option: reimplement interface masking
	USB: serial: option: adding support for ublox R410M
	usb: musb: host: fix potential NULL pointer dereference
	ipvs: fix rtnl_lock lockups caused by start_sync_thread
	crypto: af_alg - fix possible uninit-value in alg_bind()
	netlink: fix uninit-value in netlink_sendmsg
	net: fix rtnh_ok()
	net: initialize skb->peeked when cloning
	net: fix uninit-value in __hw_addr_add_ex()
	dccp: initialize ireq->ir_mark
	soreuseport: initialise timewait reuseport field
	perf: Remove superfluous allocation error check
	tcp: fix TCP_REPAIR_QUEUE bound checking
	bdi: Fix oops in wb_workfn()
	f2fs: fix a dead loop in f2fs_fiemap()
	xfrm_user: fix return value from xfrm_user_rcv_msg
	rfkill: gpio: fix memory leak in probe error path
	libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs
	tracing: Fix regex_match_front() to not over compare the test string
	can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg()
	net: atm: Fix potential Spectre v1
	atm: zatm: Fix potential Spectre v1
	Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"
	tracing/uprobe_event: Fix strncpy corner case
	perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_*
	perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr
	perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver
	perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]
	perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map()
	Linux 4.4.132

Change-Id: I66c21e374dff5a5735f1c5958021612387c635bf
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents aa3863d2 69847b97

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 131

SUBLEVEL = 132

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 


/* upper facilities limit for kvm */

unsigned long kvm_s390_fac_list_mask[] = {

	0xffe6fffbfcfdfc40UL,

	0x005e800000000000UL,

	0xffe6ffffffffffffUL,

	0x005effffffffffffUL,

};



unsigned long kvm_s390_fac_list_mask_size(void)

arch/x86/kernel/cpu/perf_event.c

+7 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/cpu.h>

#include <linux/bitops.h>

#include <linux/device.h>

#include <linux/nospec.h>



#include <asm/apic.h>

#include <asm/stacktrace.h>
@@ -300,14 +301,17 @@ set_ext_hw_attr(struct hw_perf_event *hwc, struct perf_event *event) 
	cache_type = (config >> 0) & 0xff;

	if (cache_type >= PERF_COUNT_HW_CACHE_MAX)

		return -EINVAL;

	cache_type = array_index_nospec(cache_type, PERF_COUNT_HW_CACHE_MAX);



	cache_op = (config >>  8) & 0xff;

	if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)

		return -EINVAL;

	cache_op = array_index_nospec(cache_op, PERF_COUNT_HW_CACHE_OP_MAX);



	cache_result = (config >> 16) & 0xff;

	if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)

		return -EINVAL;

	cache_result = array_index_nospec(cache_result, PERF_COUNT_HW_CACHE_RESULT_MAX);



	val = hw_cache_event_ids[cache_type][cache_op][cache_result];
@@ -404,6 +408,8 @@ int x86_setup_perfctr(struct perf_event *event) 
	if (attr->config >= x86_pmu.max_events)

		return -EINVAL;



	attr->config = array_index_nospec((unsigned long)attr->config, x86_pmu.max_events);



	/*

	 * The generic map:

	 */

arch/x86/kernel/cpu/perf_event_intel_cstate.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/perf_event.h>

#include <linux/nospec.h>

#include <asm/cpu_device_id.h>

#include "perf_event.h"
@@ -409,6 +410,7 @@ static int cstate_pmu_event_init(struct perf_event *event) 
	} else if (event->pmu == &cstate_pkg_pmu) {

		if (cfg >= PERF_CSTATE_PKG_EVENT_MAX)

			return -EINVAL;

		cfg = array_index_nospec((unsigned long)cfg, PERF_CSTATE_PKG_EVENT_MAX);

		if (!pkg_msr[cfg].attr)

			return -EINVAL;

		event->hw.event_base = pkg_msr[cfg].msr;

arch/x86/kernel/cpu/perf_event_msr.c

+6 −3
Original line number Diff line number Diff line 
#include <linux/perf_event.h>

#include <linux/nospec.h>



enum perf_msr_id {

	PERF_MSR_TSC			= 0,
@@ -115,9 +116,6 @@ static int msr_event_init(struct perf_event *event) 
	if (event->attr.type != event->pmu->type)

		return -ENOENT;



	if (cfg >= PERF_MSR_EVENT_MAX)

		return -EINVAL;



	/* unsupported modes and filters */

	if (event->attr.exclude_user   ||

	    event->attr.exclude_kernel ||
@@ -128,6 +126,11 @@ static int msr_event_init(struct perf_event *event) 
	    event->attr.sample_period) /* no sampling */

		return -EINVAL;



	if (cfg >= PERF_MSR_EVENT_MAX)

		return -EINVAL;



	cfg = array_index_nospec((unsigned long)cfg, PERF_MSR_EVENT_MAX);



	if (!msr[cfg].attr)

		return -EINVAL;