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

Commit 68418bd5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.230 into android-4.19-stable 



Changes in 4.19.230
	integrity: check the return value of audit_log_start()
	ima: Remove ima_policy file before directory
	ima: Allow template selection with ima_template[_fmt]= after ima_hash=
	mmc: sdhci-of-esdhc: Check for error num after setting mask
	net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs
	NFS: Fix initialisation of nfs_client cl_flags field
	NFSD: Clamp WRITE offsets
	NFSD: Fix offset type in I/O trace points
	NFSv4 only print the label when its queried
	nfs: nfs4clinet: check the return value of kstrdup()
	NFSv4.1: Fix uninitialised variable in devicenotify
	NFSv4 remove zero number of fs_locations entries error check
	NFSv4 expose nfs_parse_server_name function
	net: sched: Clarify error message when qdisc kind is unknown
	scsi: target: iscsi: Make sure the np under each tpg is unique
	usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend
	net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout()
	bpf: Add kconfig knob for disabling unpriv bpf by default
	ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group
	net: bridge: fix stale eth hdr pointer in br_dev_xmit
	perf probe: Fix ppc64 'perf probe add events failed' case
	ARM: dts: meson: Fix the UART compatible strings
	staging: fbtft: Fix error path in fbtft_driver_module_init()
	ARM: dts: imx6qdl-udoo: Properly describe the SD card detect
	usb: f_fs: Fix use-after-free for epfile
	ixgbevf: Require large buffers for build_skb on 82599VF
	bonding: pair enable_port with slave_arr_updates
	ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path
	net: do not keep the dst cache when uncloning an skb dst and its metadata
	net: fix a memleak when uncloning an skb dst and its metadata
	veth: fix races around rq->rx_notify_masked
	tipc: rate limit warning for received illegal binding update
	net: amd-xgbe: disable interrupts during pci removal
	vt_ioctl: fix array_index_nospec in vt_setactivate
	vt_ioctl: add array_index_nospec to VT_ACTIVATE
	n_tty: wake up poll(POLLRDNORM) on receiving data
	usb: ulpi: Move of_node_put to ulpi_dev_release
	usb: ulpi: Call of_node_put correctly
	usb: dwc3: gadget: Prevent core from processing stale TRBs
	USB: gadget: validate interface OS descriptor requests
	usb: gadget: rndis: check size of RNDIS_MSG_SET command
	USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320
	USB: serial: option: add ZTE MF286D modem
	USB: serial: ch341: add support for GW Instek USB2.0-Serial devices
	USB: serial: cp210x: add NCR Retail IO box id
	USB: serial: cp210x: add CPI Bulk Coin Recycler id
	seccomp: Invalidate seccomp mode to catch death failures
	hwmon: (dell-smm) Speed up setting of fan speed
	perf: Fix list corruption in perf_cgroup_switch()
	Linux 4.19.230

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I01d106ece6e54a9d688f57409c9b37aeb35c6707
parents aa8b0451 62a337a4

Documentation/sysctl/kernel.txt

+21 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ show up in /proc/sys/kernel: 
- sysctl_writes_strict

- tainted

- threads-max

- unprivileged_bpf_disabled

- unknown_nmi_panic

- watchdog

- watchdog_thresh
@@ -1053,6 +1054,26 @@ available RAM pages threads-max is reduced accordingly. 


==============================================================



unprivileged_bpf_disabled:



Writing 1 to this entry will disable unprivileged calls to bpf();

once disabled, calling bpf() without CAP_SYS_ADMIN will return

-EPERM. Once set to 1, this can't be cleared from the running kernel

anymore.



Writing 2 to this entry will also disable unprivileged calls to bpf(),

however, an admin can still change this setting later on, if needed, by

writing 0 or 1 to this entry.



If BPF_UNPRIV_DEFAULT_OFF is enabled in the kernel config, then this

entry will default to 2 instead of 0.



  0 - Unprivileged calls to bpf() are enabled

  1 - Unprivileged calls to bpf() are disabled without recovery

  2 - Unprivileged calls to bpf() are disabled



==============================================================



unknown_nmi_panic:



The value in this file affects behavior of handling NMI. When the

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 229

SUBLEVEL = 230

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/imx23-evk.dts

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ 
						MX23_PAD_LCD_RESET__GPIO_1_18

						MX23_PAD_PWM3__GPIO_1_29

						MX23_PAD_PWM4__GPIO_1_30

						MX23_PAD_SSP1_DETECT__SSP1_DETECT

					>;

					fsl,drive-strength = <MXS_DRIVE_4mA>;

					fsl,voltage = <MXS_VOLTAGE_HIGH>;

arch/arm/boot/dts/imx6qdl-udoo.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 * Author: Fabio Estevam <fabio.estevam@freescale.com>

 */



#include <dt-bindings/gpio/gpio.h>



/ {

	aliases {

		backlight = &backlight;
@@ -210,6 +212,7 @@ 
				MX6QDL_PAD_SD3_DAT1__SD3_DATA1		0x17059

				MX6QDL_PAD_SD3_DAT2__SD3_DATA2		0x17059

				MX6QDL_PAD_SD3_DAT3__SD3_DATA3		0x17059

				MX6QDL_PAD_SD3_DAT5__GPIO7_IO00		0x1b0b0

			>;

		};
@@ -276,7 +279,7 @@ 
&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3>;

	non-removable;

	cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/meson.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -91,14 +91,14 @@ 
			};



			uart_A: serial@84c0 {

				compatible = "amlogic,meson6-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart";

				reg = <0x84c0 0x18>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_B: serial@84dc {

				compatible = "amlogic,meson6-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart";

				reg = <0x84dc 0x18>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";
@@ -136,7 +136,7 @@ 
			};



			uart_C: serial@8700 {

				compatible = "amlogic,meson6-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart";

				reg = <0x8700 0x18>;

				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";
@@ -219,7 +219,7 @@ 
			};



			uart_AO: serial@4c0 {

				compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";

				compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";

				reg = <0x4c0 0x18>;

				interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";