wext: Pull top-level ioctl dispatch logic into helper function. (a67fa76d) · Commits · e / devices / android_kernel_xiaomi_markw

net/wireless/wext.c

+20 −6

Original line number	Diff line number	Diff line
		@@ -1079,8 +1079,10 @@ static int wext_permission_check(unsigned int cmd)
		}

		/* entry point from dev ioctl */
		int wext_handle_ioctl(struct net net, struct ifreq ifr, unsigned int cmd,
		void __user *arg)
		static int wext_ioctl_dispatch(struct net net, struct ifreq ifr,
		unsigned int cmd,
		wext_ioctl_func standard,
		wext_ioctl_func private)
		{
		int ret = wext_permission_check(cmd);

		@@ -1089,12 +1091,24 @@ int wext_handle_ioctl(struct net net, struct ifreq ifr, unsigned int cmd,

		dev_load(net, ifr->ifr_name);
		rtnl_lock();
		ret = wireless_process_ioctl(net, ifr, cmd,
		ret = wireless_process_ioctl(net, ifr, cmd, standard, private);
		rtnl_unlock();

		return ret;
		}

		int wext_handle_ioctl(struct net net, struct ifreq ifr, unsigned int cmd,
		void __user *arg)
		{
		int ret = wext_ioctl_dispatch(net, ifr, cmd,
		ioctl_standard_call,
		ioctl_private_call);
		rtnl_unlock();
		if (IW_IS_GET(cmd) && copy_to_user(arg, ifr, sizeof(struct iwreq)))

		if (ret >= 0 &&
		IW_IS_GET(cmd) &&
		copy_to_user(arg, ifr, sizeof(struct iwreq)))
		return -EFAULT;

		return ret;
		}