diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 15:57:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 15:57:31 -0700 |
| commit | 665ab0f3c8b8f86bb77b25285ac93870c7054d63 (patch) | |
| tree | c7d12c3559982eb3fb1847438d4b45ce034851e5 /net/wireless/wext-core.c | |
| parent | bf03f65b7967df5807ddef7b99f8a41d4c94fc70 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| download | linux-stable-665ab0f3c8b8f86bb77b25285ac93870c7054d63.tar.gz linux-stable-665ab0f3c8b8f86bb77b25285ac93870c7054d63.tar.bz2 linux-stable-665ab0f3c8b8f86bb77b25285ac93870c7054d63.zip | |
Merge 3.4-rc3 into tty-next
This allows us to pick up some changes needed for other serial patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless/wext-core.c')
| -rw-r--r-- | net/wireless/wext-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c index 0af7f54e4f61..af648e08e61b 100644 --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c @@ -780,8 +780,10 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd, if (cmd == SIOCSIWENCODEEXT) { struct iw_encode_ext *ee = (void *) extra; - if (iwp->length < sizeof(*ee) + ee->key_len) - return -EFAULT; + if (iwp->length < sizeof(*ee) + ee->key_len) { + err = -EFAULT; + goto out; + } } } |