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

Unverified Commit e750258f authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge remote-tracking branch 'sm8350/lineage-20' into lineage-21 

* sm8350/lineage-20:
  bus: mhi: Fix potential out-of-bound access
  rpmsg: slatecom: maintain rx_size to read
  rpmsg: slatecom: out of bound read from process_cmd
  soc: qcom: add out of bound check for AON fifo
  qcacmn: Fix out of bound read issue in ESP ie parse
  ANDROID: GKI: Update symbol list for Zebra
  UPSTREAM: usb: raw-gadget: properly handle interrupted requests
  UPSTREAM: net: prevent skb corruption on frag list segmentation
  UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc
  soc: qcom: smem: Add boundary checks for partitions
  msm: camera: sensor: Proper handling of race condition in util api
  msm: kgsl: Do not release dma and anon buffers if unmap fails
  msm: kgsl: Do not release dma and anon buffers if unmap fails
  fw-api: CL 25995600 - update fw common interface files
  fw-api: CL 25993098 - update fw common interface files
  fw-api: CL 25976261 - update fw common interface files
  fw-api: CL 25939563 - update fw common interface files
  fw-api: CL 25939560 - update fw common interface files
  fw-api: CL 25930751 - update fw common interface files
  fw-api: CL 25920610 - update fw common interface files
  ...

Change-Id: I25460e1512fbc3e10d9bb6c6d00287f3f1a696a6
parents 5e394e4a f49eef3f

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.259_81334f26ac70
 
LTS_5.4.259_70db018a109

android/abi_gki_aarch64.xml

+114696 −111220

File changed.

File size exceeds preview limit.

View original file
View changed file

android/abi_gki_aarch64_zebra

+8 −0
Original line number Diff line number Diff line
@@ -6,3 +6,11 @@ 
  nla_reserve

  nla_append

  prandom_seed

  regulatory_set_wiphy_regd_sync_rtnl

  cfg80211_cac_event

  cfg80211_radar_event

  cfg80211_chandef_valid

  kobject_add

  sock_wfree

  dev_change_flags

  netdev_master_upper_dev_get
 
 No newline at end of file

drivers/bus/mhi/devices/mhi_satellite.c

+2 −1
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ static struct mhi_sat_device *find_sat_dev_by_id( 
static bool mhi_sat_isvalid_header(struct sat_header *hdr, int len)

{

	/* validate payload size */

	if (len >= sizeof(*hdr) && (len != hdr->payload_size + sizeof(*hdr)))

	if ((len < sizeof(*hdr)) ||

		(len >= sizeof(*hdr) && (len != hdr->payload_size + sizeof(*hdr))))

		return false;



	/* validate SAT IPC version */

drivers/gpu/msm/kgsl.c

+6 −0
Original line number Diff line number Diff line
@@ -344,6 +344,9 @@ static void kgsl_destroy_ion(struct kgsl_memdesc *memdesc) 
		struct kgsl_mem_entry, memdesc);

	struct kgsl_dma_buf_meta *meta = entry->priv_data;



	if (memdesc->priv & KGSL_MEMDESC_MAPPED)

		return;



	if (meta != NULL) {

		remove_dmabuf_list(meta);

		dma_buf_unmap_attachment(meta->attach, meta->table,
@@ -367,6 +370,9 @@ static void kgsl_destroy_anon(struct kgsl_memdesc *memdesc) 
	struct scatterlist *sg;

	struct page *page;



	if (memdesc->priv & KGSL_MEMDESC_MAPPED)

		return;



	for_each_sg(memdesc->sgt->sgl, sg, memdesc->sgt->nents, i) {

		page = sg_page(sg);

		for (j = 0; j < (sg->length >> PAGE_SHIFT); j++) {