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

Commit 26bc9782 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 pointer checked for NULL may be used"

parents bb5a5822 71ef62d6

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

+3 −0
Original line number Diff line number Diff line
@@ -2602,6 +2602,9 @@ int rmnet_ipa_query_tethering_stats(struct wan_ioctl_query_tether_stats *data, 
		/* prevent string buffer overflows */

		data->upstreamIface[IFNAMSIZ-1] = '\0';

		data->tetherIface[IFNAMSIZ-1] = '\0';

	} else if (reset != false) {

		/* Data can be NULL for reset stats, checking reset != False */

		return -EINVAL;

	}



	req = kzalloc(sizeof(struct ipa_get_data_stats_req_msg_v01),

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

+3 −0
Original line number Diff line number Diff line
@@ -2760,6 +2760,9 @@ int rmnet_ipa3_query_tethering_stats(struct wan_ioctl_query_tether_stats *data, 
		/* prevent string buffer overflows */

		data->upstreamIface[IFNAMSIZ-1] = '\0';

		data->tetherIface[IFNAMSIZ-1] = '\0';

	} else if (reset != false) {

		/* Data can be NULL for reset stats, checking reset != False */

		return -EINVAL;

	}



	req = kzalloc(sizeof(struct ipa_get_data_stats_req_msg_v01),