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

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

Merge 5.4.177 into android11-5.4-lts 



Changes in 5.4.177
	PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
	psi: Fix uaf issue when psi trigger is destroyed while being polled
	cgroup-v1: Require capabilities to set release_agent
	ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
	net: amd-xgbe: ensure to reset the tx_timer_active flag
	net: amd-xgbe: Fix skb data length underflow
	net: sched: fix use-after-free in tc_new_tfilter()
	rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
	cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()
	af_packet: fix data-race in packet_setsockopt / packet_setsockopt
	Linux 5.4.177

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I41791ffa382aae8c424ca4950ca2b367302ef59a
parents 454e00ab b8f53f91

Documentation/accounting/psi.rst

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ Triggers can be set on more than one psi metric and more than one trigger 
for the same psi metric can be specified. However for each trigger a separate

file descriptor is required to be able to poll it separately from others,

therefore for each trigger a separate open() syscall should be made even

when opening the same psi interface file.

when opening the same psi interface file. Write operations to a file descriptor

with an already existing psi trigger will fail with EBUSY.



Monitors activate only when system enters stall state for the monitored

psi metric and deactivates upon exit from the stall state. While system is

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 176

SUBLEVEL = 177

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+13 −1
Original line number Diff line number Diff line
@@ -721,7 +721,9 @@ static void xgbe_stop_timers(struct xgbe_prv_data *pdata) 
		if (!channel->tx_ring)

			break;



		/* Deactivate the Tx timer */

		del_timer_sync(&channel->tx_timer);

		channel->tx_timer_active = 0;

	}

}
@@ -2765,6 +2767,14 @@ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget) 
			buf2_len = xgbe_rx_buf2_len(rdata, packet, len);

			len += buf2_len;



			if (buf2_len > rdata->rx.buf.dma_len) {

				/* Hardware inconsistency within the descriptors

				 * that has resulted in a length underflow.

				 */

				error = 1;

				goto skip_data;

			}



			if (!skb) {

				skb = xgbe_create_skb(pdata, napi, rdata,

						      buf1_len);
@@ -2794,8 +2804,10 @@ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget) 
		if (!last || context_next)

			goto read_again;



		if (!skb)

		if (!skb || error) {

			dev_kfree_skb(skb);

			goto next_packet;

		}



		/* Be sure we don't exceed the configured MTU */

		max_len = netdev->mtu + ETH_HLEN;

drivers/net/usb/ipheth.c

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) 
	if (tx_buf == NULL)

		goto free_rx_urb;



	rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,

	rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN,

				    GFP_KERNEL, &rx_urb->transfer_dma);

	if (rx_buf == NULL)

		goto free_tx_buf;
@@ -146,7 +146,7 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) 


static void ipheth_free_urbs(struct ipheth_device *iphone)

{

	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,

	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN, iphone->rx_buf,

			  iphone->rx_urb->transfer_dma);

	usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,

			  iphone->tx_urb->transfer_dma);
@@ -317,7 +317,7 @@ static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags) 


	usb_fill_bulk_urb(dev->rx_urb, udev,

			  usb_rcvbulkpipe(udev, dev->bulk_in),

			  dev->rx_buf, IPHETH_BUF_SIZE,

			  dev->rx_buf, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN,

			  ipheth_rcvbulk_callback,

			  dev);

	dev->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

drivers/pci/hotplug/pciehp_hpc.c

+4 −3
Original line number Diff line number Diff line
@@ -577,6 +577,8 @@ static irqreturn_t pciehp_isr(int irq, void *dev_id) 
	 */

	if (ctrl->power_fault_detected)

		status &= ~PCI_EXP_SLTSTA_PFD;

	else if (status & PCI_EXP_SLTSTA_PFD)

		ctrl->power_fault_detected = true;



	events |= status;

	if (!events) {
@@ -586,7 +588,7 @@ static irqreturn_t pciehp_isr(int irq, void *dev_id) 
	}



	if (status) {

		pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, events);

		pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, status);



		/*

		 * In MSI mode, all event bits must be zero before the port
@@ -660,8 +662,7 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id) 
	}



	/* Check Power Fault Detected */

	if ((events & PCI_EXP_SLTSTA_PFD) && !ctrl->power_fault_detected) {

		ctrl->power_fault_detected = 1;

	if (events & PCI_EXP_SLTSTA_PFD) {

		ctrl_err(ctrl, "Slot(%s): Power fault\n", slot_name(ctrl));

		pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,

				      PCI_EXP_SLTCTL_ATTN_IND_ON);