diff --git a/[refs] b/[refs]
index bfa6f0b77223..a89fb900a686 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 253804a25b45aad7bf4f63483f7c7b1d14ab49e2
+refs/heads/master: 5b6567ee84d6e8f7015eaa7d7c4926b4fd81746e
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ioctl.c b/trunk/drivers/staging/ath6kl/os/linux/ioctl.c
index 82c7611c2081..4f30b255fc1a 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/trunk/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -3175,6 +3175,11 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 break;
             }
 
+            if (optTxFrmCmd.optIEDataLen > MAX_OPT_DATA_LEN) {
+                ret = -EINVAL;
+                break;
+            }
+
             if (copy_from_user(data, userdata+sizeof(WMI_OPT_TX_FRAME_CMD) - 1,
                                    optTxFrmCmd.optIEDataLen)) {
                 ret = -EFAULT;