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

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

Merge "msm: ipa4: Fix to NULL pointer dereference"

parents bd643089 e5b17068

drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c

+13 −8
Original line number Diff line number Diff line
@@ -1162,10 +1162,12 @@ static void ipa3_q6_clnt_svc_arrive(struct work_struct *work) 


static void ipa3_q6_clnt_svc_exit(struct work_struct *work)

{

	if (ipa3_qmi_ctx != NULL) {

		ipa3_qmi_ctx->server_sq.sq_family = 0;

		ipa3_qmi_ctx->server_sq.sq_node = 0;

		ipa3_qmi_ctx->server_sq.sq_port = 0;

	}

}



static int ipa3_q6_clnt_svc_event_notify_svc_new(struct qmi_handle *qmi,

	struct qmi_service *service)
@@ -1174,10 +1176,11 @@ static int ipa3_q6_clnt_svc_event_notify_svc_new(struct qmi_handle *qmi, 
		  service->service, service->version, service->instance,

		  service->node, service->port);



	if (ipa3_qmi_ctx != NULL) {

		ipa3_qmi_ctx->server_sq.sq_family = AF_QIPCRTR;

		ipa3_qmi_ctx->server_sq.sq_node = service->node;

		ipa3_qmi_ctx->server_sq.sq_port = service->port;



	}

	if (!workqueues_stopped) {

		queue_delayed_work(ipa_clnt_req_workqueue,

			&ipa3_work_svc_arrive, 0);
@@ -1315,8 +1318,10 @@ static void ipa3_qmi_service_init_worker(struct work_struct *work) 


	/* start the QMI msg cache */

	ipa3_qmi_ctx = vzalloc(sizeof(*ipa3_qmi_ctx));

	if (!ipa3_qmi_ctx)

	if (!ipa3_qmi_ctx) {

		IPAWANERR("Failed to allocate the memory to ipa3_qmi_ctx\n");

		return;

	}



	ipa3_qmi_ctx->modem_cfg_emb_pipe_flt =

		ipa3_get_modem_cfg_emb_pipe_flt();