Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 208887d4 编写于 作者: D David S. Miller 提交者： David S. Miller
浏览文件
操作

wext: Make adjust_priv_size() take a "struct iw_point *". 

Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 25519a2a
隐藏空白更改
内联 并排
Showing with 3 addition and 3 deletion
net/wireless/wext.c
浏览文件 @ 208887d4
...@@ -512,9 +512,9 @@ static int get_priv_size(__u16 args) ...@@ -512,9 +512,9 @@ static int get_priv_size(__u16 args)
/* /*
* Re-calculate the size of private arguments * Re-calculate the size of private arguments
*/ */
static int adjust_priv_size(__u16 args, union iwreq_data *wrqu) static int adjust_priv_size(__u16 args, struct iw_point *iwp)
{ {
int num = wrqu->data.length; int num = iwp->length;
int max = args & IW_PRIV_SIZE_MASK; int max = args & IW_PRIV_SIZE_MASK;
int type = (args & IW_PRIV_TYPE_MASK) >> 12; int type = (args & IW_PRIV_TYPE_MASK) >> 12;
...@@ -976,7 +976,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr, ...@@ -976,7 +976,7 @@ static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,
* avoid leaking kernel bits outside. */ * avoid leaking kernel bits outside. */
if (!(descr->get_args & IW_PRIV_SIZE_FIXED)) { if (!(descr->get_args & IW_PRIV_SIZE_FIXED)) {
extra_size = adjust_priv_size(descr->get_args, extra_size = adjust_priv_size(descr->get_args,
&(iwr->u)); &(iwr->u.data));
} }
err = copy_to_user(iwr->u.data.pointer, extra, err = copy_to_user(iwr->u.data.pointer, extra,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或