Staging: rc2860: return -EFAULT on copy_to_user errors

[net-next-2.6.git] / drivers / staging / rt2860 / sta_ioctl.c

diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 33a6939cf2ae24b24c689e4f2167895b976f14a0..6b8268d3dc75a776b190694128fcbb4f43bf342e 100644 (file)
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -608,7 +608,6 @@ int rt_ioctl_siwap(struct net_device *dev,
        /* Prevent to connect AP again in STAMlmePeriodicExec */
        pAdapter->MlmeAux.AutoReconnectSsidLen = 32;
 
-       memset(Bssid, 0, MAC_ADDR_LEN);
        memcpy(Bssid, ap_addr->sa_data, MAC_ADDR_LEN);
        MlmeEnqueue(pAdapter,
                    MLME_CNTL_STATE_MACHINE,
@@ -2523,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,
                        Status =
                            copy_to_user(erq->pointer, pAd->nickname,
                                         erq->length);
+                       if (Status)
+                               Status = -EFAULT;
                        break;
                }
        case SIOCGIWRATE:       /*get default bit rate (bps) */