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

Commit c0f6b8e4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 80aaf7bb on remote branch 

Change-Id: I41009f631657fc9f605e8eb1d9f9d69580cf1883
parents 0a697c43 80aaf7bb

drivers/misc/qseecom.c

+24 −0
Original line number Diff line number Diff line
@@ -3153,6 +3153,30 @@ static int qseecom_prepare_unload_app(struct qseecom_dev_handle *data) 
	pr_debug("prepare to unload app(%d)(%s), pending %d\n",

		data->client.app_id, data->client.app_name,

		data->client.unload_pending);



	/* For keymaster we are not going to unload so no need to add it in

	 * unload app pending list as soon as we identify release ion buffer

	 * and return .

	 */

	if (!memcmp(data->client.app_name, "keymaste", strlen("keymaste"))) {

		if (data->client.dmabuf) {

			/* Each client will get same KM TA loaded handle but

			 * will allocate separate shared buffer during

			 * loading of TA, as client can't unload KM TA so we

			 * will only free out shared buffer and return early

			 * to avoid any ion buffer leak.

			 */

			qseecom_vaddr_unmap(data->client.sb_virt,

				data->client.sgt, data->client.attach,

				data->client.dmabuf);

			MAKE_NULL(data->client.sgt,

				data->client.attach, data->client.dmabuf);

		}

		__qseecom_free_tzbuf(&data->sglistinfo_shm);

		data->released = true;

		return 0;

	}



	if (data->client.unload_pending)

		return 0;

	entry = kzalloc(sizeof(*entry), GFP_KERNEL);

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt_i.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ enum ipa_fltrt_equations { 
#define IPA3_0_HW_TBL_ADDR_MASK (127)

#define IPA3_0_HW_RULE_BUF_SIZE (256)

#define IPA3_0_HW_RULE_START_ALIGNMENT (7)

#define IPA3_0_HW_RULE_PREFETCH_BUF_SIZE (128)

#define IPA3_0_HW_RULE_PREFETCH_BUF_SIZE (256)





/*

fs/exec.c

+17 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,9 @@ static int __do_execve_file(int fd, struct filename *filename, 
		goto out_unmark;



	bprm->argc = count(argv, MAX_ARG_STRINGS);

	if (bprm->argc == 0)

		pr_warn_once("process '%s' launched '%s' with NULL argv: empty string added\n",

			     current->comm, bprm->filename);

	if ((retval = bprm->argc) < 0)

		goto out;
@@ -1829,6 +1832,20 @@ static int __do_execve_file(int fd, struct filename *filename, 
	if (retval < 0)

		goto out;



	/*

	 * When argv is empty, add an empty string ("") as argv[0] to

	 * ensure confused userspace programs that start processing

	 * from argv[1] won't end up walking envp. See also

	 * bprm_stack_limits().

	 */

	if (bprm->argc == 0) {

		const char *argv[] = { "", NULL };

		retval = copy_strings_kernel(1, argv, bprm);

		if (retval < 0)

			goto out;

		bprm->argc = 1;

	}



	retval = exec_binprm(bprm);

	if (retval < 0)

		goto out;

mm/mmap.c

+7 −7
Original line number Diff line number Diff line
@@ -3178,10 +3178,9 @@ void exit_mmap(struct mm_struct *mm) 
		(void)__oom_reap_task_mm(mm);



		set_bit(MMF_OOM_SKIP, &mm->flags);

		down_write(&mm->mmap_sem);

		up_write(&mm->mmap_sem);

	}



	down_write(&mm->mmap_sem);

	if (mm->locked_vm) {

		vma = mm->mmap;

		while (vma) {
@@ -3194,8 +3193,11 @@ void exit_mmap(struct mm_struct *mm) 
	arch_exit_mmap(mm);



	vma = mm->mmap;

	if (!vma)	/* Can happen if dup_mmap() received an OOM */

	if (!vma) {

		/* Can happen if dup_mmap() received an OOM */

		up_write(&mm->mmap_sem);;

		return;

	}



	lru_add_drain();

	flush_cache_mm(mm);
@@ -3206,16 +3208,14 @@ void exit_mmap(struct mm_struct *mm) 
	free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, USER_PGTABLES_CEILING);

	tlb_finish_mmu(&tlb, 0, -1);



	/*

	 * Walk the list again, actually closing and freeing it,

	 * with preemption enabled, without holding any MM locks.

	 */

	/* Walk the list again, actually closing and freeing it. */

	while (vma) {

		if (vma->vm_flags & VM_ACCOUNT)

			nr_accounted += vma_pages(vma);

		vma = remove_vma(vma);

		cond_resched();

	}

	up_write(&mm->mmap_sem);

	vm_unacct_memory(nr_accounted);

}