Merge "msm: ipa: prevent string buffer overflows" (12be975d) · Commits · e / devices / android_kernel_sony_msm8998

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -2687,6 +2687,9 @@ int rmnet_ipa_set_data_quota(struct wan_ioctl_set_data_quota *data)
		enum ipa_upstream_type upstream_type;
		int rc = 0;

		/* prevent string buffer overflows */
		data->interface_name[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->interface_name);

		@@ -2978,6 +2981,10 @@ int rmnet_ipa_query_tethering_stats(struct wan_ioctl_query_tether_stats *data,
		enum ipa_upstream_type upstream_type;
		int rc = 0;

		/* prevent string buffer overflows */
		data->upstreamIface[IFNAMSIZ-1] = '\0';
		data->tetherIface[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->upstreamIface);

		@@ -3012,6 +3019,10 @@ int rmnet_ipa_query_tethering_stats_all(
		int rc = 0;

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

		/* prevent string buffer overflows */
		data->upstreamIface[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->upstreamIface);

		@@ -3055,6 +3066,9 @@ int rmnet_ipa_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data)

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

		/* prevent string buffer overflows */
		data->upstreamIface[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->upstreamIface);

+14 −0

Original line number	Diff line number	Diff line
		@@ -2819,6 +2819,9 @@ int rmnet_ipa3_set_data_quota(struct wan_ioctl_set_data_quota *data)
		enum ipa_upstream_type upstream_type;
		int rc = 0;

		/* prevent string buffer overflows */
		data->interface_name[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->interface_name);

		@@ -3111,6 +3114,10 @@ int rmnet_ipa3_query_tethering_stats(struct wan_ioctl_query_tether_stats *data,
		enum ipa_upstream_type upstream_type;
		int rc = 0;

		/* prevent string buffer overflows */
		data->upstreamIface[IFNAMSIZ-1] = '\0';
		data->tetherIface[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->upstreamIface);

		@@ -3145,6 +3152,10 @@ int rmnet_ipa3_query_tethering_stats_all(
		int rc = 0;

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

		/* prevent string buffer overflows */
		data->upstreamIface[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->upstreamIface);

		@@ -3188,6 +3199,9 @@ int rmnet_ipa3_reset_tethering_stats(struct wan_ioctl_reset_tether_stats *data)

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

		/* prevent string buffer overflows */
		data->upstreamIface[IFNAMSIZ-1] = '\0';

		/* get IPA backhaul type */
		upstream_type = find_upstream_type(data->upstreamIface);