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

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

Merge "msm:ipa: Fix to IPA static analysis constant null deferenced"

parents c2bf4cb1 2cee34a2

drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c

+8 −1
Original line number Diff line number Diff line
@@ -2856,6 +2856,10 @@ int rmnet_ipa_query_tethering_stats_modem( 
		kfree(req);

		kfree(resp);

		return rc;

	} else if (data == NULL) {

		kfree(req);

		kfree(resp);

		return 0;

	}



	if (resp->dl_dst_pipe_stats_list_valid) {
@@ -3037,8 +3041,11 @@ int rmnet_ipa_query_tethering_stats_all( 
int rmnet_ipa_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data)

{

	enum ipa_upstream_type upstream_type;

	struct wan_ioctl_query_tether_stats tether_stats;

	int rc = 0;



	memset(&tether_stats, 0, sizeof(struct wan_ioctl_query_tether_stats));



	/* get IPA backhaul type */

	upstream_type = find_upstream_type(data->upstreamIface);
@@ -3056,7 +3063,7 @@ int rmnet_ipa_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data) 
	} else {

		IPAWANDBG(" reset modem-backhaul stats\n");

		rc = rmnet_ipa_query_tethering_stats_modem(

			NULL, true);

			&tether_stats, true);

		if (rc) {

			IPAWANERR("reset MODEM stats failed\n");

			return rc;

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

+8 −1
Original line number Diff line number Diff line
@@ -2966,6 +2966,10 @@ static int rmnet_ipa3_query_tethering_stats_modem( 
		kfree(req);

		kfree(resp);

		return rc;

	} else if (data == NULL) {

		kfree(req);

		kfree(resp);

		return 0;

	}



	if (resp->dl_dst_pipe_stats_list_valid) {
@@ -3149,8 +3153,11 @@ int rmnet_ipa3_query_tethering_stats_all( 
int rmnet_ipa3_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data)

{

	enum ipa_upstream_type upstream_type;

	struct wan_ioctl_query_tether_stats tether_stats;

	int rc = 0;



	memset(&tether_stats, 0, sizeof(struct wan_ioctl_query_tether_stats));



	/* get IPA backhaul type */

	upstream_type = find_upstream_type(data->upstreamIface);
@@ -3168,7 +3175,7 @@ int rmnet_ipa3_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data) 
	} else {

		IPAWANERR(" reset modem-backhaul stats\n");

		rc = rmnet_ipa3_query_tethering_stats_modem(

			NULL, true);

			&tether_stats, true);

		if (rc) {

			IPAWANERR("reset MODEM stats failed\n");

			return rc;