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: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@ -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);
|
||||
|
||||
Reference in New Issue
Block a user