Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel" (4d0bd46a) · Commits · 戴 / test

This reverts commit . Ben Hutchings pointed out that the commit isn't safe since it assumes that the structure used by the driver is iw_point, when in fact there's no way to know about that. Fortunately, the only driver in the tree that ever runs this code path is the wilc1000 staging driver, so it doesn't really matter. Clearly I should have investigated this better before applying, sorry. Reported-by:

Ben Hutchings <ben@decadent.org.uk> Cc: stable@vger.kernel.org [though I guess it doesn't matter much] Fixes: ("wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel") Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/wireless/wext-core.c

+2 −23

Original line number	Diff line number	Diff line
		@@ -958,29 +958,8 @@ static int wireless_process_ioctl(struct net net, struct ifreq ifr,
		return private(dev, iwr, cmd, info, handler);
		}
		/* Old driver API : call driver ioctl handler */
		if (dev->netdev_ops->ndo_do_ioctl) {
		#ifdef CONFIG_COMPAT
		if (info->flags & IW_REQUEST_FLAG_COMPAT) {
		int ret = 0;
		struct iwreq iwr_lcl;
		struct compat_iw_point iwp_compat = (void ) &iwr->u.data;

		memcpy(&iwr_lcl, iwr, sizeof(struct iwreq));
		iwr_lcl.u.data.pointer = compat_ptr(iwp_compat->pointer);
		iwr_lcl.u.data.length = iwp_compat->length;
		iwr_lcl.u.data.flags = iwp_compat->flags;

		ret = dev->netdev_ops->ndo_do_ioctl(dev, (void *) &iwr_lcl, cmd);

		iwp_compat->pointer = ptr_to_compat(iwr_lcl.u.data.pointer);
		iwp_compat->length = iwr_lcl.u.data.length;
		iwp_compat->flags = iwr_lcl.u.data.flags;

		return ret;
		} else
		#endif
		if (dev->netdev_ops->ndo_do_ioctl)
		return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
		}
		return -EOPNOTSUPP;
		}

Admin message