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

Commit 7b4c82b1 authored by bananafunction's avatar bananafunction
Browse files

Merge linux-cip/linux-4.4.y-st @ 9edcb643



Changes (125 commits):

        da0f7c75 netfilter: nat: remove l4 protocol port rovers
        f087d4da ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
        475a5269 net: amd-xgbe: ensure to reset the tx_timer_active flag
        9bf0b2cf net: amd-xgbe: Fix skb data length underflow
        d707a4f8 rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
        43d394cd af_packet: fix data-race in packet_setsockopt / packet_setsockopt
        86ad5e66 ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()
        7a78bde1 ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()
        46057f6d ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx()
        13803fe4 spi: mediatek: Avoid NULL pointer crash in interrupt
        7a4f007f net: ieee802154: Return meaningful error codes from the netlink helpers
        36d49aec ASoC: fsl: Add missing error handling in pcm030_fabric_probe
        6df50fb4 scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe
        c8bcf72f nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client.
        46814fef EDAC/altera: Fix deferred probing
        e97d057a EDAC/xgene: Fix deferred probing
        ecf34f8f ext4: fix error handling in ext4_restore_inline_data()
        a7841982 usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS
        f86b8742 moxart: fix potential use-after-free on remove path
        5385b423 tipc: improve size validations for received domain records
        6d46b2a0 bpf: Add kconfig knob for disabling unpriv bpf by default
        3b040cd6 integrity: check the return value of audit_log_start()
        a3046690 ima: Remove ima_policy file before directory
        6aa102df NFSD: Clamp WRITE offsets
        0ba428f7 Revert "net: axienet: Wait for PhyRstCmplt after core reset"
        ea26a483 NFSv4 only print the label when its queried
        8a8419da nfs: nfs4clinet: check the return value of kstrdup()
        e5a6ab45 NFSv4 remove zero number of fs_locations entries error check
        e3b5dbfd scsi: target: iscsi: Make sure the np under each tpg is unique
        8dc468e9 usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend
        a629c8a3 ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group
        08481997 staging: fbtft: Fix error path in fbtft_driver_module_init()
        89b46336 ARM: dts: imx6qdl-udoo: Properly describe the SD card detect
        8176796e bonding: pair enable_port with slave_arr_updates
        0de6a060 ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path
        e410676a net: fix a memleak when uncloning an skb dst and its metadata
        7c250f6f tipc: rate limit warning for received illegal binding update
        fca8d5fa vt_ioctl: fix array_index_nospec in vt_setactivate
        1707d90a vt_ioctl: add array_index_nospec to VT_ACTIVATE
        09c7ca64 n_tty: wake up poll(POLLRDNORM) on receiving data
        5f859c39 usb: dwc3: gadget: Prevent core from processing stale TRBs
        1aa0a528 USB: gadget: validate interface OS descriptor requests
        e267b88f usb: gadget: rndis: check size of RNDIS_MSG_SET command
        778afcba USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320
        6177eeee USB: serial: option: add ZTE MF286D modem
        fa3fe5ad USB: serial: ch341: add support for GW Instek USB2.0-Serial devices
        ac4b74de USB: serial: cp210x: add NCR Retail IO box id
        d248b1c7 USB: serial: cp210x: add CPI Bulk Coin Recycler id
        38f8851b hwmon: (dell-smm) Speed up setting of fan speed
        6c2347af HID: wacom: add USB_HID dependency
        bc406f17 Merge patches from 4.9.302.
        c02b2c32 drm/edid: Always set RGB444
        d3690221 Makefile.extrawarn: Move -Wunaligned-access to W=1
        e15f4029 net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup
        037f2d51 serial: parisc: GSC: fix build when IOSAPIC is not set
        ca156cb4 parisc: Fix data TLB miss in sba_unmap_sg
        85dec771 parisc: Fix sglist access in ccio-dma.c
        ca393662 selftests/zram: Skip max_comp_streams interface on newer kernel
        69557dfd selftests/zram01.sh: Fix compression ratio calculation
        5307e946 selftests/zram: Adapt the situation that /dev/zram0 is being used
        e2493544 ax25: improve the incomplete fix to avoid UAF and NPD bugs
        b205512f quota: make dquot_quota_sync return errors from ->sync_fs
        a5a12992 drm/radeon: Fix backlight control on iMac 12,1
        4e9d3e98 xfrm: Don't accidentally set RTO_ONLINK in decode_session4()
        09965cb6 taskstats: Cleanup the use of task->exit_code
        a42b52da drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit
        488fad1e ALSA: hda: Fix regression on forced probe mask option
        e48b5be2 ALSA: hda: Fix missing codec probe on Shenker Dock 15
        28fababe ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw()
        8f29266b ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range()
        38654404 EDAC: Fix calculation of returned address and next offset in edac_align_ptr()
        104b57a4 KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW
        f90c6a4c ata: libata-core: Disable TRIM on M88V29
        f78208aa tracing: Fix tp_printk option related with tp_printk_stop_on_boot
        b7790e07 Merged changes from 4.9.303.
        5eba64e1 mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status
        c0c76411 parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel
        6f1c3d46 parisc/unaligned: Fix ldw() and stw() unalignment handlers
        4707c3da sr9700: sanity check for packet length
        925f10a0 USB: zaurus: support another broken Zaurus
        ef1251dd gso: do not skip outer ip header in case of ipip and net_failover
        f02680be openvswitch: Fix setting ipv6 fields causing hw csum failure
        a268b246 configfs: fix a race in configfs_{,un}register_subsystem()
        6f37a2d8 RDMA/ib_srp: Fix a deadlock
        3cc154d9 iio: adc: men_z188_adc: Fix a resource leak in an error handling path
        37c443e0 ata: pata_hpt37x: disable primary channel on HPT371
        6e2a9a90 Revert "USB: serial: ch341: add new Product ID for CH341A"
        39a72e45 USB: gadget: validate endpoint index for xilinx udc
        b1e7d369 tracefs: Set the group ownership in apply_options() not parse_options()
        f9564d8c USB: serial: option: add support for DW5829e
        d89907f8 USB: serial: option: add Telit LE910R1 compositions
        98a75730 usb: dwc3: gadget: Let the interrupt handler disable bottom halves.
        c751a8bf xhci: Prevent futile URB re-submissions due to incorrect return value.
        e97db20c tty: n_gsm: fix encoding of control signal octet bit DV
        bdd77ce7 tty: n_gsm: fix proper link termination after failed open
        950f5723 fget: clarify and improve __fget_files() implementation
        82bdcca4 Update with patches from 4.9.304.
        b2e15370 mac80211_hwsim: report NOACK frames in tx_status
        7b81fadd mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
        04c2a216 i2c: bcm2835: Avoid clock stretching timeouts
        48deed98 Input: clear BTN_RIGHT/MIDDLE on buttonpads
        9178ea87 cifs: fix double free race when mount fails in cifs_get_root()
        e26c3094 dmaengine: shdma: Fix runtime PM imbalance on error
        b91859ff i2c: qup: allow COMPILE_TEST
        dd747d7d usb: gadget: don't release an existing dev->buf
        5e612c9b usb: gadget: clear related members when goto fail
        74603e6b ata: pata_hpt37x: fix PCI clock detection
        e41846db ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min
        7dc406d4 xfrm: fix MTU regression
        779f60d0 netfilter: nf_queue: don't assume sk is full socket
        0bf4da4a netfilter: nf_queue: fix possible use-after-free
        1554e9fe net: dcb: flush lingering app table entries for unregistered devices
        58dbf324 mac80211: fix forwarded mesh frames AC & queue selection
        71802bda net: stmmac: fix return value of __setup handler
        c2569cf3 net: sxgbe: fix return value of __setup handler
        d51bed21 net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()
        7c2fc44c can: gs_usb: change active_channels's type from atomic_t to u8
        11f3505f ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions
        ddb6023e net: chelsio: cxgb3: check the return value of pci_find_capability()
        47f2c199 Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
        0efb2547 Input: elan_i2c - fix regulator enable count imbalance after suspend/resume
        40a5e67e HID: add mapping for KEY_ALL_APPLICATIONS
        dc357c20 net: dcb: disable softirqs in dcbnl_flush_dev()
        69e3f3cf hamradio: fix macro redefine warning
        9edcb643 Merge changes from 4.9.305.

Signed-off-by: default avatarbananafunction <terathree2@web.de>
parents f2ee0b1f 9edcb643
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ show up in /proc/sys/kernel:
- sysctl_writes_strict
- tainted
- threads-max
- unprivileged_bpf_disabled
- unknown_nmi_panic
- watchdog
- watchdog_thresh
@@ -944,6 +945,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
+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,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>;
+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@
 *
 */

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

/ {
	chosen {
		stdout-path = &uart2;
@@ -107,6 +109,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
			>;
		};
	};
@@ -129,6 +132,6 @@
&usdhc3 {
	pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_usdhc3>;
	non-removable;
	cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
	status = "okay";
};
+2 −0
Original line number Diff line number Diff line
@@ -228,12 +228,14 @@ early_param("ecc", early_ecc);
static int __init early_cachepolicy(char *p)
{
	pr_warn("cachepolicy kernel parameter not supported without cp15\n");
	return 0;
}
early_param("cachepolicy", early_cachepolicy);

static int __init noalign_setup(char *__unused)
{
	pr_warn("noalign kernel parameter not supported without cp15\n");
	return 1;
}
__setup("noalign", noalign_setup);

+7 −7
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop)
	: "r" (val), "r" (regs->ior), "r" (regs->isr)
	: "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );

	return 0;
	return ret;
}
static int emulate_std(struct pt_regs *regs, int frreg, int flop)
{
@@ -411,7 +411,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
	__asm__ __volatile__ (
"	mtsp	%4, %%sr1\n"
"	zdep	%2, 29, 2, %%r19\n"
"	dep	%%r0, 31, 2, %2\n"
"	dep	%%r0, 31, 2, %3\n"
"	mtsar	%%r19\n"
"	zvdepi	-2, 32, %%r19\n"
"1:	ldw	0(%%sr1,%3),%%r20\n"
@@ -423,7 +423,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
"	andcm	%%r21, %%r19, %%r21\n"
"	or	%1, %%r20, %1\n"
"	or	%2, %%r21, %2\n"
"3:	stw	%1,0(%%sr1,%1)\n"
"3:	stw	%1,0(%%sr1,%3)\n"
"4:	stw	%%r1,4(%%sr1,%3)\n"
"5:	stw	%2,8(%%sr1,%3)\n"
"	copy	%%r0, %0\n"
@@ -611,7 +611,6 @@ void handle_unaligned(struct pt_regs *regs)
		ret = ERR_NOTHANDLED;	/* "undefined", but lets kill them. */
		break;
	}
#ifdef CONFIG_PA20
	switch (regs->iir & OPCODE2_MASK)
	{
	case OPCODE_FLDD_L:
@@ -622,22 +621,23 @@ void handle_unaligned(struct pt_regs *regs)
		flop=1;
		ret = emulate_std(regs, R2(regs->iir),1);
		break;
#ifdef CONFIG_PA20
	case OPCODE_LDD_L:
		ret = emulate_ldd(regs, R2(regs->iir),0);
		break;
	case OPCODE_STD_L:
		ret = emulate_std(regs, R2(regs->iir),0);
		break;
	}
#endif
	}
	switch (regs->iir & OPCODE3_MASK)
	{
	case OPCODE_FLDW_L:
		flop=1;
		ret = emulate_ldw(regs, R2(regs->iir),0);
		ret = emulate_ldw(regs, R2(regs->iir), 1);
		break;
	case OPCODE_LDW_M:
		ret = emulate_ldw(regs, R2(regs->iir),1);
		ret = emulate_ldw(regs, R2(regs->iir), 0);
		break;

	case OPCODE_FSTW_L:
Loading