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

Commit 941f0e4a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.162 into android-4.19-stable 



Changes in 4.19.162
	ipv6: addrlabel: fix possible memory leak in ip6addrlbl_net_init
	net/af_iucv: set correct sk_protocol for child sockets
	net/tls: missing received data after fast remote close
	rose: Fix Null pointer dereference in rose_send_frame()
	sock: set sk_err to ee_errno on dequeue from errq
	tcp: Set INET_ECN_xmit configuration in tcp_reinit_congestion_control
	tun: honor IOCB_NOWAIT flag
	usbnet: ipheth: fix connectivity with iOS 14
	net/tls: Protect from calling tls_dev_del for TLS RX twice
	ibmvnic: fix call_netdevice_notifiers in do_reset
	i40e: Fix removing driver while bare-metal VFs pass traffic
	bonding: wait for sysfs kobject destruction before freeing struct slave
	netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal
	ipv4: Fix tos mask in inet_rtm_getroute()
	ibmvnic: Ensure that SCRQ entry reads are correctly ordered
	ibmvnic: Fix TX completion error handling
	geneve: pull IP header before ECN decapsulation
	net: ip6_gre: set dev->hard_header_len when using header_ops
	net/x25: prevent a couple of overflows
	cxgb3: fix error return code in t3_sge_alloc_qset()
	net: pasemi: fix error return code in pasemi_mac_open()
	chelsio/chtls: fix a double free in chtls_setkey()
	net: mvpp2: Fix error return code in mvpp2_open()
	net/mlx5: Fix wrong address reclaim when command interface is down
	chelsio/chtls: fix panic during unload reload chtls
	dt-bindings: net: correct interrupt flags in examples
	ALSA: usb-audio: US16x08: fix value count for level meters
	Input: xpad - support Ardwiino Controllers
	Input: i8042 - add ByteSpeed touchpad to noloop table
	tracing: Remove WARN_ON in start_thread()
	RDMA/i40iw: Address an mmap handler exploit in i40iw
	Linux 4.19.162

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Idb0e720cc744d8499967a25291a6932b2b8388c6
parents 2f5d5944 4abf2685

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2): 
		clock-frequency = <100000>;



		interrupt-parent = <&gpio1>;

		interrupts = <29 GPIO_ACTIVE_HIGH>;

		interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;



		enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/net/nfc/pn544.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2): 
		clock-frequency = <400000>;



		interrupt-parent = <&gpio1>;

		interrupts = <17 GPIO_ACTIVE_HIGH>;

		interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;



		enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 161

SUBLEVEL = 162

EXTRAVERSION =

NAME = "People's Front"

drivers/crypto/chelsio/chtls/chtls_cm.c

+1 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 


	oreq->ts_recent = PASS_OPEN_TID_G(ntohl(req->tos_stid));

	sk_setup_caps(newsk, dst);

	newsk->sk_prot_creator = lsk->sk_prot_creator;

	csk->sk = newsk;

	csk->passive_reap_next = oreq;

	csk->tx_chan = cxgb4_port_chan(ndev);

drivers/crypto/chelsio/chtls/chtls_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ int chtls_setkey(struct chtls_sock *csk, u32 keylen, u32 optname) 
	csk->wr_unacked += DIV_ROUND_UP(len, 16);

	enqueue_wr(csk, skb);

	cxgb4_ofld_send(csk->egress_dev, skb);

	skb = NULL;



	chtls_set_scmd(csk);

	/* Clear quiesce for Rx key */