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

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

Merge 4.19.25 into android-4.19 



Changes in 4.19.25
	af_packet: fix raw sockets over 6in4 tunnel
	dsa: mv88e6xxx: Ensure all pending interrupts are handled prior to exit
	mlxsw: __mlxsw_sp_port_headroom_set(): Fix a use of local variable
	net: crypto set sk to NULL when af_alg_release.
	net: Fix for_each_netdev_feature on Big endian
	net: fix IPv6 prefix route residue
	net: ip6_gre: initialize erspan_ver just for erspan tunnels
	net: ipv4: use a dedicated counter for icmp_v4 redirect packets
	net: phy: xgmiitorgmii: Support generic PHY status read
	net: stmmac: Fix a race in EEE enable callback
	net: stmmac: handle endianness in dwmac4_get_timestamp
	sky2: Increase D3 delay again
	vhost: correctly check the return value of translate_desc() in log_used()
	vsock: cope with memory allocation failure at socket creation time
	vxlan: test dev->flags & IFF_UP before calling netif_rx()
	net: Add header for usage of fls64()
	tcp: clear icsk_backoff in tcp_write_queue_purge()
	tcp: tcp_v4_err() should be more careful
	net: Do not allocate page fragments that are not skb aligned
	hwmon: (lm80) Fix missing unlock on error in set_fan_div()
	scsi: target/core: Use kmem_cache_free() instead of kfree()
	mmc: meson-gx: fix interrupt name
	PCI: Fix __initdata issue with "pci=disable_acs_redir" parameter
	sunrpc: fix 4 more call sites that were using stack memory with a scatterlist
	netfilter: nf_nat_snmp_basic: add missing length checks in ASN.1 cbs
	net/x25: do not hold the cpu too long in x25_new_lci()
	mISDN: fix a race in dev_expire_timer()
	ax25: fix possible use-after-free
	Linux 4.19.25

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents cca7d2df eb1e5b1a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 24

SUBLEVEL = 25

EXTRAVERSION =

NAME = "People's Front"

crypto/af_alg.c

+3 −1
Original line number Diff line number Diff line
@@ -122,8 +122,10 @@ static void alg_do_release(const struct af_alg_type *type, void *private) 


int af_alg_release(struct socket *sock)

{

	if (sock->sk)

	if (sock->sk) {

		sock_put(sock->sk);

		sock->sk = NULL;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(af_alg_release);

drivers/hwmon/lm80.c

+3 −1
Original line number Diff line number Diff line
@@ -393,8 +393,10 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, 
	}



	rv = lm80_read_value(client, LM80_REG_FANDIV);

	if (rv < 0)

	if (rv < 0) {

		mutex_unlock(&data->update_lock);

		return rv;

	}

	reg = (rv & ~(3 << (2 * (nr + 1))))

	    | (data->fan_div[nr] << (2 * (nr + 1)));

	lm80_write_value(client, LM80_REG_FANDIV, reg);

drivers/isdn/mISDN/timerdev.c

+1 −1
Original line number Diff line number Diff line
@@ -170,8 +170,8 @@ dev_expire_timer(struct timer_list *t) 
	spin_lock_irqsave(&timer->dev->lock, flags);

	if (timer->id >= 0)

		list_move_tail(&timer->list, &timer->dev->expired);

	spin_unlock_irqrestore(&timer->dev->lock, flags);

	wake_up_interruptible(&timer->dev->wait);

	spin_unlock_irqrestore(&timer->dev->lock, flags);

}



static int

drivers/mmc/host/meson-gx-mmc.c

+2 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,8 @@ static int meson_mmc_probe(struct platform_device *pdev) 
	       host->regs + SD_EMMC_IRQ_EN);



	ret = request_threaded_irq(host->irq, meson_mmc_irq,

			meson_mmc_irq_thread, IRQF_SHARED, NULL, host);

				   meson_mmc_irq_thread, IRQF_SHARED,

				   dev_name(&pdev->dev), host);

	if (ret)

		goto err_init_clk;