Messages in this thread Patch in this message | | | Subject | [PATCH 2/3] staging: wilc1000: One function call less in mac_ioctl() after error detection | From | SF Markus Elfring <> | Date | Sun, 24 Jul 2016 22:22:06 +0200 |
| |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Sun, 24 Jul 2016 21:15:23 +0200
The kfree() function was called in two cases by the mac_ioctl() function during error handling even if the passed variable did not contain a pointer for a valid data item.
Improve this implementation detail by the introduction of another jump label.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/staging/wilc1000/linux_wlan.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index cdef645..7b1ebcc 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1130,7 +1130,7 @@ static int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) if (copy_to_user(wrq->u.data.pointer, buff, size)) { netdev_err(ndev, "failed to copy\n"); ret = -EFAULT; - goto done; + goto free_buffer; } } } @@ -1144,11 +1144,9 @@ static int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) goto done; } } - -done: - +free_buffer: kfree(buff); - +done: return ret; } -- 2.9.2
| |