Unverified Commit 9713e4bd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!838 Backport 5.10.154 LTS

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.154 LTS patches from upstream.

Conflicts:

Already merged(11):
3583826b443a  net: tun: fix bugs for oversize packet when napi frags enabled
cb1c012099ef  Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu
d9ec6e2fbd4a  Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del()
6b6f94fb9a74  Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM
26ca2ac091b4  Bluetooth: L2CAP: Fix attempting to access uninitialized memory
818c36b988b8  tcp/udp: Fix memory leak in ipv6_renew_options().
836686e1a01d  memcg: enable accounting of ipc resources
015ac18be7de  binder: fix UAF of alloc->vma in race with munmap()
ea5f2fd4640e  ftrace: Fix use-after-free for dynamic ftrace_ops
2bf33b5ea46d  tcp/udp: Make early_demux back namespacified.
c6678c8f4f3f  wifi: brcmfmac: Fix potential buffer overflow in brcmf_fweh_event_worker()


context confilict(4):  
523e1dd9f8d4  KVM: nVMX: Pull KVM L0's desired controls directly from vmcs01
391cceee6d43  fscrypt: stop using keyrings subsystem for fscrypt_master_key
29997a6fa60d  fscrypt: fix keyring memory leak on mount failure
e33ce54cef5d  coresight: cti: Fix hang in cti_disable_hw()


Total patches: 117 - 11 = 106 
 
Link:https://gitee.com/openeuler/kernel/pulls/838

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 28186029 1f3f08b9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment