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

Commit 11d940fd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: adsprpc: Add error handling checks"

parents f6528a28 5e45e500

drivers/char/adsprpc.c

+7 −4
Original line number Diff line number Diff line
@@ -1429,10 +1429,12 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 


		mutex_lock(&ctx->fl->map_mutex);

		if (ctx->fds && (ctx->fds[i] != -1))

			fastrpc_mmap_create(ctx->fl, ctx->fds[i],

			err = fastrpc_mmap_create(ctx->fl, ctx->fds[i],

					ctx->attrs[i], buf, len,

					mflags, &ctx->maps[i]);

		mutex_unlock(&ctx->fl->map_mutex);

		if (err)

			goto bail;

		ipage += 1;

	}

	PERF_END);
@@ -1443,9 +1445,10 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 


		if (ctx->attrs && (ctx->attrs[i] & FASTRPC_ATTR_NOMAP))

			dmaflags = FASTRPC_DMAHANDLE_NOMAP;

		VERIFY(err, !fastrpc_mmap_create(ctx->fl, ctx->fds[i],

		if (ctx->fds && (ctx->fds[i] != -1))

			err = fastrpc_mmap_create(ctx->fl, ctx->fds[i],

					FASTRPC_ATTR_NOVA, 0, 0, dmaflags,

				&ctx->maps[i]));

					&ctx->maps[i]);

		if (err) {

			mutex_unlock(&ctx->fl->map_mutex);

			goto bail;