android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This is the 5.10.100 stable release

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmIGGagACgkQONu9yGCS
 aT48rBAAin0WRL4yvqtF5Oji7oIi3WqKk6mIUGNbAzkhJCF09n179aCIV+jDy2oQ
 Q5wYNwwjMxqSUKu4hyfVNCdOAcYkcqMfrcn2RDAaLnwTdjhaCCYZcdiDI5ODZiM9
 BatqSZIv4JIM4kuwSzNEALy1QdCZ2SGpQbIC8q+TLze5K5N7lLzx0J8DY8nZt4Wr
 +ZDSNBWLof4BYD3XI/Sxx70OJCOUiOoNDOKqYOBQ349wNEfeiGNDz90ooPkYevLb
 9w4R+CH5P/KSnLNda06ziaTLEbApOVwdDJrCBQG3iZ2OVouGYICmNc24v4/TCCqJ
 2h/6y/+fZ47sphdDDZCsk1lUwMsK9SZLIY1Y4NhnObl6Yhpe53zFOuno/putiEXi
 /pQCaRPj/E1LdzoIJF54Sj5QOh1V6itm5eRPvNsIys8AyIG8DYcp+TGj4fBCRHMy
 MNeqtPKOtrDX5poFoLgAt6SDmWgM6dUIQii0dJlEBAYWfaJBXx4+EZ3Ld92PkVJq
 lqMyCmcW4L/6UlrpazBWTZI7H0hzfhCV+Bc9loAWECRC/21KZb4W0wc6XdaxqPTW
 Jckm1wb4ou/zVWWzIJ9+jVFrkzdZjPlUKzUJP6ZczFW36XDo9t3RSfx9flvbiPh+
 /PYxADJX0sQTAIhiNUKVombiz7LP/GGtI3HHOwwReMI4KkQzbL8=
 =VIYg
 -----END PGP SIGNATURE-----

Merge 5.10.100 into android12-5.10-lts

Changes in 5.10.100
	moxart: fix potential use-after-free on remove path
	KVM: s390: Return error on SIDA memop on normal guest
	crypto: api - Move cryptomgr soft dependency into algapi
	tipc: improve size validations for received domain records
	Linux 5.10.100

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I171e1de80869482794b41d437fd66993a0c8a1d5
This commit is contained in:
Greg Kroah-Hartman 2022-02-11 09:19:01 +01:00
commit 86e6176a42
7 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 10
SUBLEVEL = 99
SUBLEVEL = 100
EXTRAVERSION =
NAME = Dare mighty things

2
arch/s390/kvm/kvm-s390.c
View File

@ -4654,6 +4654,8 @@ static long kvm_s390_guest_sida_op(struct kvm_vcpu *vcpu,
return -EINVAL;
if (mop->size + mop->sida_offset > sida_size(vcpu->arch.sie_block))
return -E2BIG;
if (!kvm_s390_pv_cpu_is_protected(vcpu))
return -EINVAL;
switch (mop->op) {
case KVM_S390_MEMOP_SIDA_READ:

1
crypto/algapi.c
View File

@ -1295,3 +1295,4 @@ module_exit(crypto_algapi_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Cryptographic algorithms API");
MODULE_SOFTDEP("pre: cryptomgr");

1
crypto/api.c
View File

@ -603,4 +603,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);
MODULE_DESCRIPTION("Cryptographic core API");
MODULE_LICENSE("GPL");
MODULE_SOFTDEP("pre: cryptomgr");

2
drivers/mmc/host/moxart-mmc.c
View File

@ -708,12 +708,12 @@ static int moxart_remove(struct platform_device *pdev)
if (!IS_ERR_OR_NULL(host->dma_chan_rx))
dma_release_channel(host->dma_chan_rx);
mmc_remove_host(mmc);
mmc_free_host(mmc);
writel(0, host->base + REG_INTERRUPT_MASK);
writel(0, host->base + REG_POWER_CONTROL);
writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF,
host->base + REG_CLOCK_CONTROL);
mmc_free_host(mmc);
return 0;
}

9
net/tipc/link.c
View File

@ -2159,7 +2159,7 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
struct tipc_msg *hdr = buf_msg(skb);
struct tipc_gap_ack_blks *ga = NULL;
bool reply = msg_probe(hdr), retransmitted = false;
u16 dlen = msg_data_sz(hdr), glen = 0;
u32 dlen = msg_data_sz(hdr), glen = 0;
u16 peers_snd_nxt = msg_next_sent(hdr);
u16 peers_tol = msg_link_tolerance(hdr);
u16 peers_prio = msg_linkprio(hdr);
@ -2173,6 +2173,10 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
void *data;
trace_tipc_proto_rcv(skb, false, l->name);
if (dlen > U16_MAX)
goto exit;
if (tipc_link_is_blocked(l) || !xmitq)
goto exit;
@ -2268,7 +2272,8 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
/* Receive Gap ACK blocks from peer if any */
glen = tipc_get_gap_ack_blks(&ga, l, hdr, true);
if(glen > dlen)
break;
tipc_mon_rcv(l->net, data + glen, dlen - glen, l->addr,
&l->mon_state, l->bearer_id);

2
net/tipc/monitor.c
View File

@ -465,6 +465,8 @@ void tipc_mon_rcv(struct net *net, void *data, u16 dlen, u32 addr,
state->probing = false;
/* Sanity check received domain record */
if (new_member_cnt > MAX_MON_DOMAIN)
return;
if (dlen < dom_rec_len(arrv_dom, 0))
return;
if (dlen != dom_rec_len(arrv_dom, new_member_cnt))