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

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

Merge "msm: rmnet_ipa: fix memory overflow issue" into msm-4.9

parents d103ddad ba7c511c

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

+3 −0
Original line number Diff line number Diff line
@@ -1541,6 +1541,9 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
			memcpy(mux_channel[rmnet_index].vchannel_name,

				extend_ioctl_data.u.rmnet_mux_val.vchannel_name,

				sizeof(mux_channel[rmnet_index].vchannel_name));

			mux_channel[rmnet_index].vchannel_name[

				IFNAMSIZ - 1] = '\0';



			IPAWANDBG("cashe device[%s:%d] in IPA_wan[%d]\n",

				mux_channel[rmnet_index].vchannel_name,

				mux_channel[rmnet_index].mux_id,

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

+3 −0
Original line number Diff line number Diff line
@@ -1655,6 +1655,9 @@ static int ipa3_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
				extend_ioctl_data.u.rmnet_mux_val.vchannel_name,

				sizeof(mux_channel[rmnet_index]

					.vchannel_name));

			mux_channel[rmnet_index].vchannel_name[

				IFNAMSIZ - 1] = '\0';



			IPAWANDBG("cashe device[%s:%d] in IPA_wan[%d]\n",

				mux_channel[rmnet_index].vchannel_name,

				mux_channel[rmnet_index].mux_id,