Skip to content

Commit

Permalink
[PATCH] libertas: correct error report paths for wlan_fwt_list_ioctl
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Williams authored and John W. Linville committed Jun 11, 2007
1 parent 6cfb008 commit 94b2385
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/net/wireless/libertas/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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;
}

/**
Expand Down

0 comments on commit 94b2385

Please sign in to comment.