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

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

Merge 5.4.55 into android11-5.4 



Changes in 5.4.55
	AX.25: Fix out-of-bounds read in ax25_connect()
	AX.25: Prevent out-of-bounds read in ax25_sendmsg()
	dev: Defer free of skbs in flush_backlog
	drivers/net/wan/x25_asy: Fix to make it work
	ip6_gre: fix null-ptr-deref in ip6gre_init_net()
	net-sysfs: add a newline when printing 'tx_timeout' by sysfs
	net: udp: Fix wrong clean up for IS_UDPLITE macro
	qrtr: orphan socket in qrtr_release()
	rtnetlink: Fix memory(net_device) leak when ->newlink fails
	rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA
	tcp: allow at most one TLP probe per flight
	AX.25: Prevent integer overflows in connect and sendmsg
	sctp: shrink stream outq only when new outcnt < old outcnt
	sctp: shrink stream outq when fails to do addstream reconf
	udp: Copy has_conns in reuseport_grow().
	udp: Improve load balancing for SO_REUSEPORT.
	regmap: debugfs: check count when read regmap file
	PM: wakeup: Show statistics for deleted wakeup sources again
	Revert "dpaa_eth: fix usage as DSA master, try 3"
	Linux 5.4.55

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I776630d05a9d6a34f76719cb3d2fb6b9790d643b
parents 763a90d2 169b9389

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 54

SUBLEVEL = 55

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/base/power/wakeup.c

+3 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,9 @@ static void *wakeup_sources_stats_seq_next(struct seq_file *m, 
		break;

	}



	if (!next_ws)

		print_wakeup_source_stats(m, &deleted_ws);



	return next_ws;

}

drivers/base/regmap/regmap-debugfs.c

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from, 
	if (*ppos < 0 || !count)

		return -EINVAL;



	if (count > (PAGE_SIZE << (MAX_ORDER - 1)))

		count = PAGE_SIZE << (MAX_ORDER - 1);



	buf = kmalloc(count, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;
@@ -371,6 +374,9 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file, 
	if (*ppos < 0 || !count)

		return -EINVAL;



	if (count > (PAGE_SIZE << (MAX_ORDER - 1)))

		count = PAGE_SIZE << (MAX_ORDER - 1);



	buf = kmalloc(count, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -2802,7 +2802,7 @@ static int dpaa_eth_probe(struct platform_device *pdev) 
	}



	/* Do this here, so we can be verbose early */

	SET_NETDEV_DEV(net_dev, dev->parent);

	SET_NETDEV_DEV(net_dev, dev);

	dev_set_drvdata(dev, net_dev);



	priv = netdev_priv(net_dev);

drivers/net/wan/x25_asy.c

+14 −7
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static inline void x25_asy_unlock(struct x25_asy *sl) 
	netif_wake_queue(sl->dev);

}



/* Send one completely decapsulated IP datagram to the IP layer. */

/* Send an LAPB frame to the LAPB module to process. */



static void x25_asy_bump(struct x25_asy *sl)

{
@@ -195,13 +195,12 @@ static void x25_asy_bump(struct x25_asy *sl) 
	count = sl->rcount;

	dev->stats.rx_bytes += count;



	skb = dev_alloc_skb(count+1);

	skb = dev_alloc_skb(count);

	if (skb == NULL) {

		netdev_warn(sl->dev, "memory squeeze, dropping packet\n");

		dev->stats.rx_dropped++;

		return;

	}

	skb_push(skb, 1);	/* LAPB internal control */

	skb_put_data(skb, sl->rbuff, count);

	skb->protocol = x25_type_trans(skb, sl->dev);

	err = lapb_data_received(skb->dev, skb);
@@ -209,7 +208,6 @@ static void x25_asy_bump(struct x25_asy *sl) 
		kfree_skb(skb);

		printk(KERN_DEBUG "x25_asy: data received err - %d\n", err);

	} else {

		netif_rx(skb);

		dev->stats.rx_packets++;

	}

}
@@ -356,12 +354,21 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb, 
 */



/*

 *	Called when I frame data arrives. We did the work above - throw it

 *	at the net layer.

 *	Called when I frame data arrive. We add a pseudo header for upper

 *	layers and pass it to upper layers.

 */



static int x25_asy_data_indication(struct net_device *dev, struct sk_buff *skb)

{

	if (skb_cow(skb, 1)) {

		kfree_skb(skb);

		return NET_RX_DROP;

	}

	skb_push(skb, 1);

	skb->data[0] = X25_IFACE_DATA;



	skb->protocol = x25_type_trans(skb, dev);



	return netif_rx(skb);

}
@@ -657,7 +664,7 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s) 
	switch (s) {

	case X25_END:

		if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&

		    sl->rcount > 2)

		    sl->rcount >= 2)

			x25_asy_bump(sl);

		clear_bit(SLF_ESCAPE, &sl->flags);

		sl->rcount = 0;