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

Commit 706f7aa8 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 add string NULL terminator"

parents d19b1e69 7cf413c7

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

+1 −0
Original line number Diff line number Diff line
@@ -1608,6 +1608,7 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
				IPAWANERR("Failed to allocate memory.\n");

				return -ENOMEM;

			}

			extend_ioctl_data.u.if_name[IFNAMSIZ-1] = '\0';

			len = sizeof(wan_msg->upstream_ifname) >

			sizeof(extend_ioctl_data.u.if_name) ?

				sizeof(extend_ioctl_data.u.if_name) :

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

+1 −0
Original line number Diff line number Diff line
@@ -1699,6 +1699,7 @@ static int ipa3_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
				IPAWANERR("Failed to allocate memory.\n");

				return -ENOMEM;

			}

			extend_ioctl_data.u.if_name[IFNAMSIZ-1] = '\0';

			len = sizeof(wan_msg->upstream_ifname) >

			sizeof(extend_ioctl_data.u.if_name) ?

				sizeof(extend_ioctl_data.u.if_name) :