From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org,
Austin Shin <austin.shin@atmel.com>,
Chris Park <chris.park@atmel.com>, Glen Lee <glen.lee@atmel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Johnny Kim <johnny.kim@atmel.com>, Leo Kim <leo.kim@atmel.com>,
Tony Cho <tony.cho@atmel.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH 2/3] staging: wilc1000: One function call less in mac_ioctl() after error detection
Date: Sun, 24 Jul 2016 22:22:06 +0200 [thread overview]
Message-ID: <590e0614-db41-a193-5463-9e3ad2630489@users.sourceforge.net> (raw)
In-Reply-To: <dbc8c4f3-a234-9b6a-b6a4-9c7ef45d5d31@users.sourceforge.net>
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
next prev parent reply other threads:[~2016-07-24 20:22 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5307CAA2.8060406@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402212321410.2043@localhost6.localdomain6>
[not found] ` <530A086E.8010901@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402231635510.1985@localhost6.localdomain6>
[not found] ` <530A72AA.3000601@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402240658210.2090@localhost6.localdomain6>
[not found] ` <530B5FB6.6010207@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402241710370.2074@hadrien>
[not found] ` <530C5E18.1020800@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402251014170.2080@hadrien>
[not found] ` <530CD2C4.4050903@users.sourceforge.net>
[not found] ` <alpine.DEB.2.10.1402251840450.7035@hadrien>
[not found] ` <530CF8FF.8080600@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402252117150.2047@localhost6.localdomain6>
[not found] ` <530DD06F.4090703@users.sourceforge.net>
[not found] ` <alpine.DEB.2.02.1402262129250.2221@localhost6.localdomain6>
[not found] ` <5317A59D.4@users.sourceforge.net>
2014-11-20 15:50 ` [PATCH 1/1] net: brcm80211: Deletion of unnecessary checks before two function calls SF Markus Elfring
2014-11-20 18:04 ` Arend van Spriel
2015-11-06 7:58 ` [PATCH] net: brcm80211: Delete an unnecessary check before the function call "release_firmware" SF Markus Elfring
2015-11-11 9:18 ` Arend van Spriel
2015-11-26 12:04 ` brcm80211: Delete an unnecessary check before the function call"release_firmware" Kalle Valo
2015-02-04 16:45 ` [PATCH 0/2] CW1200: Deletion of an unnecessary check SF Markus Elfring
2015-02-04 16:47 ` [PATCH 1/2] CW1200: Delete an unnecessary check before the function call "release_firmware" SF Markus Elfring
2015-02-06 6:49 ` [1/2] cw1200: " Kalle Valo
2015-02-04 16:48 ` [PATCH 2/2] CW1200: Less function calls in cw1200_load_firmware_cw1200() after error detection SF Markus Elfring
2015-02-04 17:54 ` [PATCH] ath9k: Delete an unnecessary check before the function call "relay_close" SF Markus Elfring
2015-02-06 6:50 ` ath9k: Delete an unnecessary check before the function call"relay_close" Kalle Valo
2015-02-04 18:33 ` [PATCH] ath10k: Delete unnecessary checks before the function call "release_firmware" SF Markus Elfring
2015-03-04 12:06 ` Kalle Valo
2015-02-04 18:56 ` [PATCH] orinoco: Delete an unnecessary check before the function call "kfree" SF Markus Elfring
2015-02-06 6:51 ` Kalle Valo
2015-02-04 19:10 ` [PATCH] HostAP: " SF Markus Elfring
2015-02-06 6:52 ` hostap: " Kalle Valo
2015-02-04 19:40 ` [PATCH] net: brcm80211: Delete unnecessary checks before two function calls SF Markus Elfring
2015-02-06 6:53 ` Kalle Valo
2015-06-27 14:29 ` [PATCH 0/2] staging: wilc1000: Deletion of two unnecessary checks SF Markus Elfring
2015-06-27 14:36 ` [PATCH 1/2] staging: wilc1000: Delete unnecessary checks before two function calls SF Markus Elfring
2015-07-07 2:31 ` Greg Kroah-Hartman
2015-07-07 6:21 ` Clarification for the use of additional fields in the message body SF Markus Elfring
2015-07-07 6:40 ` Frans Klaver
2015-07-07 7:54 ` SF Markus Elfring
2015-07-07 8:23 ` Frans Klaver
2015-07-07 11:53 ` SF Markus Elfring
2015-07-07 14:13 ` Frans Klaver
2015-07-07 16:15 ` SF Markus Elfring
2015-07-07 23:43 ` Julian Calaby
2015-07-08 7:09 ` SF Markus Elfring
2015-07-08 7:36 ` Julian Calaby
2015-07-08 9:28 ` SF Markus Elfring
2015-07-08 11:05 ` Julian Calaby
2015-07-08 13:46 ` SF Markus Elfring
2015-07-08 23:47 ` Julian Calaby
2015-07-08 15:03 ` Theodore Ts'o
2015-07-08 15:27 ` SF Markus Elfring
2015-07-09 16:51 ` Theodore Ts'o
2015-06-27 14:37 ` [PATCH 2/2] staging: wilc1000: One function call less in mac_ioctl() after error detection SF Markus Elfring
2015-06-27 16:21 ` Julia Lawall
2015-07-07 2:31 ` Greg Kroah-Hartman
2015-07-08 8:40 ` SF Markus Elfring
2016-07-24 20:15 ` [PATCH 0/3] staging: wilc1000: Fine-tuning for two function implementations SF Markus Elfring
2016-07-24 20:20 ` [PATCH 1/3] staging: wilc1000: Delete an unnecessary check before the function call "release_firmware" SF Markus Elfring
2016-07-24 20:22 ` SF Markus Elfring [this message]
2016-07-28 12:02 ` [PATCH 2/3] staging: wilc1000: One function call less in mac_ioctl() after error detection Julian Calaby
2016-07-24 20:23 ` [PATCH 3/3] staging: wilc1000: Reduce scope for a few variables in mac_ioctl() SF Markus Elfring
2015-11-14 21:50 ` [PATCH] NFC-nci: Delete unnecessary checks before the function call "kfree_skb" SF Markus Elfring
2015-11-16 12:18 ` [PATCH] rtlwifi: " SF Markus Elfring
2015-11-26 13:01 ` rtlwifi: Delete unnecessary checks before the function call"kfree_skb" Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=590e0614-db41-a193-5463-9e3ad2630489@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=austin.shin@atmel.com \
--cc=chris.park@atmel.com \
--cc=devel@driverdev.osuosl.org \
--cc=glen.lee@atmel.com \
--cc=gregkh@linuxfoundation.org \
--cc=johnny.kim@atmel.com \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=leo.kim@atmel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=tony.cho@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).