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

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

Merge "msm: ipa3: Verify IPA client id before using it"

parents e5a68ffa bb1606be

drivers/platform/msm/ipa/ipa_common_i.h

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -26,7 +26,8 @@ 
		log_info.file = __FILENAME__; \

		log_info.line = __LINE__; \

		log_info.type = EP; \

		log_info.id_string = ipa_clients_strings[client]

		log_info.id_string = (client < 0 || client >= IPA_CLIENT_MAX) \

			? "Invalid Client" : ipa_clients_strings[client]



#define IPA_ACTIVE_CLIENTS_PREP_SIMPLE(log_info) \

		log_info.file = __FILENAME__; \

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

+3 −0
Original line number Diff line number Diff line
@@ -1177,10 +1177,13 @@ void ipa3_qmi_service_exit(void) 
	}



	/* clean the QMI msg cache */

	mutex_lock(&ipa3_qmi_lock);

	if (ipa3_qmi_ctx != NULL) {

		vfree(ipa3_qmi_ctx);

		ipa3_qmi_ctx = NULL;

	}

	mutex_unlock(&ipa3_qmi_lock);



	ipa3_svc_handle = 0;

	ipa3_qmi_modem_init_fin = false;

	ipa3_qmi_indication_fin = false;