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

Commit f6b87805 authored Apr 19, 2018 by Mohammed Javid

msm: ipa: rmnet: Make code changes with respect to CR#2046006



Check for CAP_NET_ADMIN capability of the user
space application who tries to access rmnet driver IOCTL.

Change-Id: If6bb4b54659306c5103b5e34bf02c7234c851e0a
CRs-Fixed: 2226355
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>

parent 829d7d99

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1317,6 +1317,8 @@ static int ipa_wwan_ioctl(struct net_device dev, struct ifreq ifr, int cmd)

	/* Extended IOCTLs */		/* Extended IOCTLs */
	case RMNET_IOCTL_EXTENDED:		case RMNET_IOCTL_EXTENDED:
			if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
			return -EPERM;
	IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");		IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");
	if (copy_from_user(&extend_ioctl_data,		if (copy_from_user(&extend_ioctl_data,
	(u8 *)ifr->ifr_ifru.ifru_data,		(u8 *)ifr->ifr_ifru.ifru_data,

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1451,6 +1451,8 @@ static int ipa3_wwan_ioctl(struct net_device dev, struct ifreq ifr, int cmd)

	/* Extended IOCTLs */		/* Extended IOCTLs */
	case RMNET_IOCTL_EXTENDED:		case RMNET_IOCTL_EXTENDED:
			if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
			return -EPERM;
	IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");		IPAWANDBG("get ioctl: RMNET_IOCTL_EXTENDED\n");
	if (copy_from_user(&extend_ioctl_data,		if (copy_from_user(&extend_ioctl_data,
	(u8 *)ifr->ifr_ifru.ifru_data,		(u8 *)ifr->ifr_ifru.ifru_data,