kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-12-21 03:24:24 -08:00 committed by David S. Miller
parent 25519a2a76
commit 208887d4cc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/wireless/wext.c
View file

@ -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,
* 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,