net/wireless/wext-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
When GET ioctls encounter insufficient buffer (-E2BIG),
preserve u.data.length metadata in iwreq structure for size detection
Typical usage in userspace tools like 'iwlist wlan0 scanning':
- Detect required buffer size via u.data.length
- Implement retry logic with proper allocation
Signed-off-by: Callan Huang <luvings@qq.com>
---
net/wireless/wext-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index c32a7c690..b4f72a49f 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -1075,7 +1075,7 @@ int wext_handle_ioctl(struct net *net, unsigned int cmd, void __user *arg)
ret = wext_ioctl_dispatch(net, &iwr, cmd, &info,
ioctl_standard_call,
ioctl_private_call);
- if (ret >= 0 &&
+ if ((ret >= 0 || ret == -E2BIG) &&
IW_IS_GET(cmd) &&
copy_to_user(arg, &iwr, sizeof(struct iwreq)))
return -EFAULT;
@@ -1138,7 +1138,7 @@ int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
compat_standard_call,
compat_private_call);
- if (ret >= 0 &&
+ if ((ret >= 0 || ret == -E2BIG) &&
IW_IS_GET(cmd) &&
copy_to_user(argp, &iwr, sizeof(struct iwreq)))
return -EFAULT;
--
2.25.1
On Thu, 2025-08-07 at 21:10 +0800, Callan Huang wrote: > When GET ioctls encounter insufficient buffer (-E2BIG), > preserve u.data.length metadata in iwreq structure for size detection > > Typical usage in userspace tools like 'iwlist wlan0 scanning': > - Detect required buffer size via u.data.length > - Implement retry logic with proper allocation If you'd sent this patch 15 years ago I probably would've taken it, but honestly, at this point ... no. Just use nl80211, or large buffers in the userspace to start with. There's a very small buffer limit _anyway_, so that getting the full scan list in busy environments is actually impossible with wext. johannes
© 2016 - 2025 Red Hat, Inc.