diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-20 17:31:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-20 17:31:25 -0700 |
| commit | 86c2fe1e3adacec9204c03f2b056b49534ecf0ed (patch) | |
| tree | 9d6a2c3f3802cd83d5a266df1d2576bd77aaad93 /net | |
| parent | 1ddbcb005c395518c2cd0df504cff3d4b5c85853 (diff) | |
| parent | a6c67339784db5763d6f20ae1881aeebe8c5a9f4 (diff) | |
| download | linux-3.10-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.tar.gz linux-3.10-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.tar.bz2 linux-3.10-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 7 | ||||
| -rw-r--r-- | net/wireless/wext.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 08265ca1578..487cb627ddb 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1551,6 +1551,13 @@ static int regulatory_hint_core(const char *alpha2) queue_regulatory_request(request); + /* + * This ensures last_request is populated once modules + * come swinging in and calling regulatory hints and + * wiphy_apply_custom_regulatory(). + */ + flush_scheduled_work(); + return 0; } diff --git a/net/wireless/wext.c b/net/wireless/wext.c index cb6a5bb85d8..0e59f9ae9b8 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c @@ -786,6 +786,13 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd, err = -EFAULT; goto out; } + + if (cmd == SIOCSIWENCODEEXT) { + struct iw_encode_ext *ee = (void *) extra; + + if (iwp->length < sizeof(*ee) + ee->key_len) + return -EFAULT; + } } err = handler(dev, info, (union iwreq_data *) iwp, extra); |