mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 08:14:15 +08:00
[PATCH] libertas: correct error report paths for wlan_fwt_list_ioctl
Ensure the leave debug print gets triggered when necessary. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
6cfb008238
commit
94b23855c0
@ -603,12 +603,14 @@ static int wlan_fwt_list_ioctl(wlan_private * priv, struct ifreq *req)
|
||||
char *ptr = in_str;
|
||||
static char out_str[128];
|
||||
char *pbuf = out_str;
|
||||
int ret;
|
||||
int ret = 0;
|
||||
|
||||
lbs_deb_enter(LBS_DEB_IOCTL);
|
||||
|
||||
if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
|
||||
return -EFAULT;
|
||||
if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str))) {
|
||||
ret = -EFAULT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
|
||||
|
||||
@ -632,11 +634,15 @@ static int wlan_fwt_list_ioctl(wlan_private * priv, struct ifreq *req)
|
||||
if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
|
||||
wrq->u.data.length)) {
|
||||
lbs_deb_ioctl("FWT_LIST: Copy to user failed!\n");
|
||||
return -EFAULT;
|
||||
ret = -EFAULT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
|
||||
out:
|
||||
lbs_deb_leave(LBS_DEB_IOCTL);
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user