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

Commit 60bba945 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.209 into android11-5.4-lts 



Changes in 5.4.209
	Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put
	ntfs: fix use-after-free in ntfs_ucsncmp()
	s390/archrandom: prevent CPACF trng invocations in interrupt context
	tcp: Fix data-races around sysctl_tcp_dsack.
	tcp: Fix a data-race around sysctl_tcp_app_win.
	tcp: Fix a data-race around sysctl_tcp_adv_win_scale.
	tcp: Fix a data-race around sysctl_tcp_frto.
	tcp: Fix a data-race around sysctl_tcp_nometrics_save.
	ice: check (DD | EOF) bits on Rx descriptor rather than (EOP | RS)
	ice: do not setup vlan for loopback VSI
	scsi: ufs: host: Hold reference returned by of_parse_phandle()
	tcp: Fix a data-race around sysctl_tcp_limit_output_bytes.
	tcp: Fix a data-race around sysctl_tcp_challenge_ack_limit.
	net: ping6: Fix memleak in ipv6_renew_options().
	ipv6/addrconf: fix a null-ptr-deref bug for ip6_ptr
	igmp: Fix data-races around sysctl_igmp_qrv.
	net: sungem_phy: Add of_node_put() for reference returned by of_get_parent()
	tcp: Fix a data-race around sysctl_tcp_min_tso_segs.
	tcp: Fix a data-race around sysctl_tcp_min_rtt_wlen.
	tcp: Fix a data-race around sysctl_tcp_autocorking.
	tcp: Fix a data-race around sysctl_tcp_invalid_ratelimit.
	Documentation: fix sctp_wmem in ip-sysctl.rst
	tcp: Fix a data-race around sysctl_tcp_comp_sack_delay_ns.
	tcp: Fix a data-race around sysctl_tcp_comp_sack_nr.
	i40e: Fix interface init with MSI interrupts (no MSI-X)
	sctp: fix sleep in atomic context bug in timer handlers
	netfilter: nf_queue: do not allow packet truncation below transport header offset
	virtio-net: fix the race between refill work and close
	perf symbol: Correct address for bss symbols
	sfc: disable softirqs for ptp TX
	sctp: leave the err path free in sctp_stream_init to sctp_stream_free
	ARM: crypto: comment out gcc warning that breaks clang builds
	mt7601u: add USB device ID for some versions of XiaoDu WiFi Dongle.
	scsi: core: Fix race between handling STS_RESOURCE and completion
	Linux 5.4.209

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I47925760dda15390893286236095322cdfb31837
parents 5b72a540 8d8935e7

Documentation/networking/ip-sysctl.txt

+8 −1
Original line number Diff line number Diff line
@@ -2297,7 +2297,14 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max 
	Default: 4K



sctp_wmem  - vector of 3 INTEGERs: min, default, max

	Currently this tunable has no effect.

	Only the first value ("min") is used, "default" and "max" are

	ignored.



	min: Minimum size of send buffer that can be used by SCTP sockets.

	It is guaranteed to each SCTP socket (but not association) even

	under moderate memory pressure.



	Default: 4K



addr_scope_policy - INTEGER

	Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 208

SUBLEVEL = 209

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/lib/xor-neon.c

+2 −1
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ MODULE_LICENSE("GPL"); 
 * While older versions of GCC do not generate incorrect code, they fail to

 * recognize the parallel nature of these functions, and emit plain ARM code,

 * which is known to be slower than the optimized ARM code in asm-arm/xor.h.

 *

 * #warning This code requires at least version 4.6 of GCC

 */

#warning This code requires at least version 4.6 of GCC

#endif



#pragma GCC diagnostic ignored "-Wunused-variable"

arch/s390/include/asm/archrandom.h

+6 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Kernel interface for the s390 arch_random_* functions

 *

 * Copyright IBM Corp. 2017, 2020

 * Copyright IBM Corp. 2017, 2022

 *

 * Author: Harald Freudenberger <freude@de.ibm.com>

 *
@@ -14,6 +14,7 @@ 
#ifdef CONFIG_ARCH_RANDOM



#include <linux/static_key.h>

#include <linux/preempt.h>

#include <linux/atomic.h>

#include <asm/cpacf.h>
@@ -32,7 +33,8 @@ static inline bool __must_check arch_get_random_int(unsigned int *v) 


static inline bool __must_check arch_get_random_seed_long(unsigned long *v)

{

	if (static_branch_likely(&s390_arch_random_available)) {

	if (static_branch_likely(&s390_arch_random_available) &&

	    in_task()) {

		cpacf_trng(NULL, 0, (u8 *)v, sizeof(*v));

		atomic64_add(sizeof(*v), &s390_arch_random_counter);

		return true;
@@ -42,7 +44,8 @@ static inline bool __must_check arch_get_random_seed_long(unsigned long *v) 


static inline bool __must_check arch_get_random_seed_int(unsigned int *v)

{

	if (static_branch_likely(&s390_arch_random_available)) {

	if (static_branch_likely(&s390_arch_random_available) &&

	    in_task()) {

		cpacf_trng(NULL, 0, (u8 *)v, sizeof(*v));

		atomic64_add(sizeof(*v), &s390_arch_random_counter);

		return true;

drivers/net/ethernet/intel/i40e/i40e_main.c

+4 −0
Original line number Diff line number Diff line
@@ -1821,11 +1821,15 @@ static void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi, 
		 * non-zero req_queue_pairs says that user requested a new

		 * queue count via ethtool's set_channels, so use this

		 * value for queues distribution across traffic classes

		 * We need at least one queue pair for the interface

		 * to be usable as we see in else statement.

		 */

		if (vsi->req_queue_pairs > 0)

			vsi->num_queue_pairs = vsi->req_queue_pairs;

		else if (pf->flags & I40E_FLAG_MSIX_ENABLED)

			vsi->num_queue_pairs = pf->num_lan_msix;

		else

			vsi->num_queue_pairs = 1;

	}



	/* Number of queues per enabled TC */