staging: vt6655: don't leak when returning -EOPNOTSUPP in vt6655_hostap_ioctl
Make sure we always free(param); and remove a redundant "goto out;" just before we'll hit the label anyway. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6b8c28192d
commit
e72f8762f8
|
@ -720,7 +720,6 @@ static int hostap_get_encryption(PSDevice pDevice,
|
|||
* Return Value:
|
||||
*
|
||||
*/
|
||||
|
||||
int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
|
||||
{
|
||||
struct viawget_hostapd_param *param;
|
||||
|
@ -755,8 +754,8 @@ int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
|
|||
break;
|
||||
case VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR \n");
|
||||
return -EOPNOTSUPP;
|
||||
break;
|
||||
ret = -EOPNOTSUPP;
|
||||
goto out;
|
||||
case VIAWGET_HOSTAPD_FLUSH:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_FLUSH \n");
|
||||
spin_lock_irq(&pDevice->lock);
|
||||
|
@ -790,40 +789,36 @@ int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
|
|||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_FLAGS_STA \n");
|
||||
ret = hostap_set_flags_sta(pDevice, param);
|
||||
break;
|
||||
|
||||
case VIAWGET_HOSTAPD_MLME:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_MLME \n");
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = -EOPNOTSUPP;
|
||||
goto out;
|
||||
case VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT \n");
|
||||
ret = hostap_set_generic_element(pDevice, param);
|
||||
break;
|
||||
|
||||
case VIAWGET_HOSTAPD_SCAN_REQ:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SCAN_REQ \n");
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = -EOPNOTSUPP;
|
||||
goto out;
|
||||
case VIAWGET_HOSTAPD_STA_CLEAR_STATS:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_STA_CLEAR_STATS \n");
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = -EOPNOTSUPP;
|
||||
goto out;
|
||||
default:
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vt6655_hostap_ioctl: unknown cmd=%d\n",
|
||||
(int)param->cmd);
|
||||
return -EOPNOTSUPP;
|
||||
break;
|
||||
ret = -EOPNOTSUPP;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((ret == 0) && ap_ioctl) {
|
||||
if (copy_to_user(p->pointer, param, p->length)) {
|
||||
ret = -EFAULT;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
kfree(param);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue