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

Commit 1912b022 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.104 into android-4.14-p 



Changes in 4.14.104
	ARM: 8834/1: Fix: kprobes: optimized kprobes illegal instruction
	tracing: Fix number of entries in trace header
	MIPS: eBPF: Always return sign extended 32b values
	mac80211: Restore vif beacon interval if start ap fails
	mac80211: Free mpath object when rhashtable insertion fails
	libceph: handle an empty authorize reply
	ceph: avoid repeatedly adding inode to mdsc->snap_flush_list
	numa: change get_mempolicy() to use nr_node_ids instead of MAX_NUMNODES
	proc, oom: do not report alien mms when setting oom_score_adj
	KEYS: allow reaching the keys quotas exactly
	mfd: ti_am335x_tscadc: Use PLATFORM_DEVID_AUTO while registering mfd cells
	pvcalls-back: set -ENOTCONN in pvcalls_conn_back_read
	mfd: twl-core: Fix section annotations on {,un}protect_pm_master
	mfd: db8500-prcmu: Fix some section annotations
	mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported
	mfd: ab8500-core: Return zero in get_register_interruptible()
	mfd: bd9571mwv: Add volatile register to make DVFS work
	mfd: qcom_rpm: write fw_version to CTRL_REG
	mfd: wm5110: Add missing ASRC rate register
	mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe()
	mfd: mc13xxx: Fix a missing check of a register-read failure
	xen/pvcalls: remove set but not used variable 'intf'
	qed: Fix qed_chain_set_prod() for PBL chains with non power of 2 page count
	qed: Fix qed_ll2_post_rx_buffer_notify_fw() by adding a write memory barrier
	net: hns: Fix use after free identified by SLUB debug
	MIPS: ath79: Enable OF serial ports in the default config
	netfilter: nf_tables: fix leaking object reference count
	scsi: qla4xxx: check return code of qla4xxx_copy_from_fwddb_param
	scsi: isci: initialize shost fully before calling scsi_add_host()
	MIPS: jazz: fix 64bit build
	bpf: correctly set initial window on active Fast Open sender
	net: stmmac: Fix PCI module removal leak
	isdn: i4l: isdn_tty: Fix some concurrency double-free bugs
	scsi: ufs: Fix system suspend status
	scsi: qedi: Add ep_state for login completion on un-reachable targets
	always clear the X2APIC_ENABLE bit for PV guest
	drm/meson: add missing of_node_put
	atm: he: fix sign-extension overflow on large shift
	hwmon: (tmp421) Correct the misspelling of the tmp442 compatible attribute in OF device ID table
	leds: lp5523: fix a missing check of return value of lp55xx_read
	bpf: bpf_setsockopt: reset sock dst on SO_MARK changes
	mlxsw: spectrum_switchdev: Do not treat static FDB entries as sticky
	net/mlx5e: Fix wrong (zero) TX drop counter indication for representor
	isdn: avm: Fix string plus integer warning from Clang
	batman-adv: fix uninit-value in batadv_interface_tx()
	ipv6: propagate genlmsg_reply return code
	net/mlx5e: Don't overwrite pedit action when multiple pedit used
	net/packet: fix 4gb buffer limit due to overflow check
	net: sfp: do not probe SFP module before we're attached
	sctp: call gso_reset_checksum when computing checksum in sctp_gso_segment
	team: avoid complex list operations in team_nl_cmd_options_set()
	sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()
	net/mlx4_en: Force CHECKSUM_NONE for short ethernet frames
	inet_diag: fix reporting cgroup classid and fallback to priority
	RDMA/srp: Rework SCSI device reset handling
	KEYS: user: Align the payload buffer
	KEYS: always initialize keyring_index_key::desc_len
	parisc: Fix ptrace syscall number modification
	ARCv2: Enable unaligned access in early ASM code
	ARC: U-boot: check arguments paranoidly
	ARC: define ARCH_SLAB_MINALIGN = 8
	drm/i915/fbdev: Actually configure untiled displays
	net: validate untrusted gso packets without csum offload
	net: avoid false positives in untrusted gso validation
	Revert "bridge: do not add port to router list when receives query with source 0.0.0.0"
	netfilter: nf_tables: fix flush after rule deletion in the same batch
	netfilter: nft_compat: use-after-free when deleting targets
	netfilter: ipv6: Don't preserve original oif for loopback address
	pinctrl: max77620: Use define directive for max77620_pinconf_param values
	phy: tegra: remove redundant self assignment of 'map'
	sched/sysctl: Fix attributes of some extern declarations
	net: phylink: avoid resolving link state too early
	Linux 4.14.104

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d38adba7 30921fc1

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 103

SUBLEVEL = 104

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/include/asm/cache.h

+11 −0
Original line number Diff line number Diff line
@@ -52,6 +52,17 @@ 
#define cache_line_size()	SMP_CACHE_BYTES

#define ARCH_DMA_MINALIGN	SMP_CACHE_BYTES



/*

 * Make sure slab-allocated buffers are 64-bit aligned when atomic64_t uses

 * ARCv2 64-bit atomics (LLOCKD/SCONDD). This guarantess runtime 64-bit

 * alignment for any atomic64_t embedded in buffer.

 * Default ARCH_SLAB_MINALIGN is __alignof__(long long) which has a relaxed

 * value of 4 (and not 8) in ARC ABI.

 */

#if defined(CONFIG_ARC_HAS_LL64) && defined(CONFIG_ARC_HAS_LLSC)

#define ARCH_SLAB_MINALIGN	8

#endif



extern void arc_cache_init(void);

extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);

extern void read_decode_cache_bcr(void);

arch/arc/kernel/head.S

+12 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/entry.h>

#include <asm/arcregs.h>

#include <asm/cache.h>

#include <asm/irqflags.h>



.macro CPU_EARLY_SETUP
@@ -47,6 +48,15 @@ 
	sr	r5, [ARC_REG_DC_CTRL]



1:



#ifdef CONFIG_ISA_ARCV2

	; Unaligned access is disabled at reset, so re-enable early as

	; gcc 7.3.1 (ARC GNU 2018.03) onwards generates unaligned access

	; by default

	lr	r5, [status32]

	bset	r5, r5, STATUS_AD_BIT

	kflag	r5

#endif

.endm



	.section .init.text, "ax",@progbits
@@ -93,9 +103,9 @@ ENTRY(stext) 
#ifdef CONFIG_ARC_UBOOT_SUPPORT

	; Uboot - kernel ABI

	;    r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2

	;    r1 = magic number (board identity, unused as of now

	;    r1 = magic number (always zero as of now)

	;    r2 = pointer to uboot provided cmdline or external DTB in mem

	; These are handled later in setup_arch()

	; These are handled later in handle_uboot_args()

	st	r0, [@uboot_tag]

	st	r2, [@uboot_arg]

#endif

arch/arc/kernel/setup.c

+62 −25
Original line number Diff line number Diff line
@@ -414,44 +414,81 @@ void setup_processor(void) 
	arc_chk_core_config();

}



static inline int is_kernel(unsigned long addr)

static inline bool uboot_arg_invalid(unsigned long addr)

{

	if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)

		return 1;

	return 0;

	/*

	 * Check that it is a untranslated address (although MMU is not enabled

	 * yet, it being a high address ensures this is not by fluke)

	 */

	if (addr < PAGE_OFFSET)

		return true;



	/* Check that address doesn't clobber resident kernel image */

	return addr >= (unsigned long)_stext && addr <= (unsigned long)_end;

}



void __init setup_arch(char **cmdline_p)

#define IGNORE_ARGS		"Ignore U-boot args: "



/* uboot_tag values for U-boot - kernel ABI revision 0; see head.S */

#define UBOOT_TAG_NONE		0

#define UBOOT_TAG_CMDLINE	1

#define UBOOT_TAG_DTB		2



void __init handle_uboot_args(void)

{

	bool use_embedded_dtb = true;

	bool append_cmdline = false;



#ifdef CONFIG_ARC_UBOOT_SUPPORT

	/* make sure that uboot passed pointer to cmdline/dtb is valid */

	if (uboot_tag && is_kernel((unsigned long)uboot_arg))

		panic("Invalid uboot arg\n");

	/* check that we know this tag */

	if (uboot_tag != UBOOT_TAG_NONE &&

	    uboot_tag != UBOOT_TAG_CMDLINE &&

	    uboot_tag != UBOOT_TAG_DTB) {

		pr_warn(IGNORE_ARGS "invalid uboot tag: '%08x'\n", uboot_tag);

		goto ignore_uboot_args;

	}



	/* See if u-boot passed an external Device Tree blob */

	machine_desc = setup_machine_fdt(uboot_arg);	/* uboot_tag == 2 */

	if (!machine_desc)

	if (uboot_tag != UBOOT_TAG_NONE &&

            uboot_arg_invalid((unsigned long)uboot_arg)) {

		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);

		goto ignore_uboot_args;

	}



	/* see if U-boot passed an external Device Tree blob */

	if (uboot_tag == UBOOT_TAG_DTB) {

		machine_desc = setup_machine_fdt((void *)uboot_arg);



		/* external Device Tree blob is invalid - use embedded one */

		use_embedded_dtb = !machine_desc;

	}



	if (uboot_tag == UBOOT_TAG_CMDLINE)

		append_cmdline = true;



ignore_uboot_args:

#endif

	{

		/* No, so try the embedded one */



	if (use_embedded_dtb) {

		machine_desc = setup_machine_fdt(__dtb_start);

		if (!machine_desc)

			panic("Embedded DT invalid\n");

	}



	/*

		 * If we are here, it is established that @uboot_arg didn't

		 * point to DT blob. Instead if u-boot says it is cmdline,

		 * append to embedded DT cmdline.

		 * setup_machine_fdt() would have populated @boot_command_line

	 * NOTE: @boot_command_line is populated by setup_machine_fdt() so this

	 * append processing can only happen after.

	 */

		if (uboot_tag == 1) {

	if (append_cmdline) {

		/* Ensure a whitespace between the 2 cmdlines */

		strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);

			strlcat(boot_command_line, uboot_arg,

				COMMAND_LINE_SIZE);

		strlcat(boot_command_line, uboot_arg, COMMAND_LINE_SIZE);

	}

}



void __init setup_arch(char **cmdline_p)

{

	handle_uboot_args();



	/* Save unparsed command line copy for /proc/cmdline */

	*cmdline_p = boot_command_line;

arch/arm/probes/kprobes/opt-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or 
	}



	/* Copy arch-dep-instance from template. */

	memcpy(code, (unsigned char *)optprobe_template_entry,

	memcpy(code, (unsigned long *)&optprobe_template_entry,

			TMPL_END_IDX * sizeof(kprobe_opcode_t));



	/* Adjust buffer according to instruction. */