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

Commit 9a602fbe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ADSPRPC: Null check for file session context"

parents 196fc041 e3edf3ec

drivers/char/adsprpc.c

+8 −0
Original line number Diff line number Diff line
@@ -1399,6 +1399,14 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 


	if (fl->profile)

		getnstimeofday(&invoket);



	VERIFY(err, fl->sctx != NULL);

	if (err)

		goto bail;

	VERIFY(err, fl->cid >= 0 && fl->cid < NUM_CHANNELS);

	if (err)

		goto bail;



	if (!kernel) {

		VERIFY(err, 0 == context_restore_interrupted(fl, inv,

								&ctx));

drivers/char/adsprpc_shared.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define VERIFY(err, val) \

do {\

	VERIFY_IPRINTF(__FILE_LINE__"info: calling: " #val "\n");\

	if (0 == (val)) {\

	if ((val) == 0) {\

		(err) = (err) == 0 ? -1 : (err);\

		VERIFY_EPRINTF(__FILE_LINE__"error: %d: " #val "\n", (err));\

	} else {\