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

Commit d9f51072 authored by Tharun Kumar Merugu's avatar Tharun Kumar Merugu Committed by Gerrit - the friendly Code Review server
Browse files

msm: ADSPRPC: Free PD memory in case of failures during PD creation 



There is possible leak in dma memory allocated for user PD
in case of any failures during PD creation. Changes are made
to free this dma buffer during error conditions. Also, made
changes to ensure that per user PD, fastRPC doesn't allocate
PD memory multiple times. In case PD memory is already allocated
and we are trying to allocate PD memory for the same process
once again, made changes to free the previously allocated dma
buffer and use the newly allocated dma buffer instead.

Change-Id: Ief703cbbca177f33d2064d89af46e6cf1cc0ed21
Acked-by: default avatarVishnu Karthik D <vikarthi@qti.qualcomm.com>
Signed-off-by: default avatarTharun Kumar Merugu <mtharu@codeaurora.org>
parent a9c50a83

drivers/char/adsprpc.c

+9 −1
Original line number Diff line number Diff line
@@ -2090,8 +2090,10 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		err = fastrpc_buf_alloc(fl, memlen, imem_dma_attr, 0, 0, &imem);

		if (err)

			goto bail;

		fl->init_mem = imem;

		if (fl->init_mem)

			fastrpc_buf_free(fl->init_mem, 0);



		fl->init_mem = imem;

		inbuf.pageslen = 1;

		ra[0].buf.pv = (void *)&inbuf;

		ra[0].buf.len = sizeof(inbuf);
@@ -2249,6 +2251,12 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		fastrpc_mmap_free(mem, 0);

		mutex_unlock(&fl->map_mutex);

	}

	if (err) {

		if (!IS_ERR_OR_NULL(fl->init_mem)) {

			fastrpc_buf_free(fl->init_mem, 0);

			fl->init_mem = NULL;

		}

	}

	if (file) {

		mutex_lock(&fl->map_mutex);

		fastrpc_mmap_free(file, 0);