> diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
> index 6250b1c..50583fb 100644
> --- a/net/wireless/wext-core.c
> +++ b/net/wireless/wext-core.c
> @@ -958,8 +958,28 @@ 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)
> - return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
> + if (dev->netdev_ops->ndo_do_ioctl) {
> + if (info->flags & IW_REQUEST_FLAG_COMPAT) {
> + int ret = 0;
> + struct iwreq iwrp;
> + struct compat_iw_point *iwp_compat =
> + (struct compat_iw_point *) &iwr->u.data;
No need for the long cast - use (void *).
> + strncpy(iwrp.ifr_ifrn.ifrn_name, iwr->ifr_ifrn.ifrn_name,
> IFNAMSIZ);
> + iwrp.u.data.pointer = compat_ptr(iwp_compat->pointer);
> + iwrp.u.data.length = iwp_compat->length;
> + iwrp.u.data.flags = iwp_compat->flags;
Maybe you should clear iwrp first?
> + ret = dev->netdev_ops->ndo_do_ioctl(dev, (struct ifreq *)
> &iwrp, cmd);
Same here with the cast.
I'd blissfully forgotten how totally crufty this API is ... oh well.
> + iwp_compat->pointer = ptr_to_compat(iwrp.u.data.pointer);
> + iwp_compat->length = iwrp.u.data.length;
> + iwp_compat->flags = iwrp.u.data.flags;
> + return ret;
> + } else {
> + return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
Please resend as a proper patch, with signed-off-by etc., and a commit
log explaining the problem and solution.
Thanks,
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
