From: Geliang Tang <geliangtang@gmail.com>
To: Jes Sorensen <jes@trained-monkey.org>
Cc: Geliang Tang <geliangtang@gmail.com>,
linux-hippi@sunsite.dk, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] net/hippi/rrunner: use memdup_user
Date: Sat, 6 May 2017 23:42:16 +0800 [thread overview]
Message-ID: <58733b05cfe6248e30471a59ad1faee7f2f71280.1493780932.git.geliangtang@gmail.com> (raw)
In-Reply-To: <df8091d4c64a0d5a7ab0a5989f34552a5eebd15e.1493778999.git.geliangtang@gmail.com>
Use memdup_user() helper instead of open-coding to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
drivers/net/hippi/rrunner.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 9b0d614..1ce6239 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1616,17 +1616,14 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
return -EPERM;
}
- image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
- oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
- if (!image || !oldimage) {
- error = -ENOMEM;
- goto wf_out;
- }
+ image = memdup_user(rq->ifr_data, EEPROM_BYTES);
+ if (IS_ERR(image))
+ return PTR_ERR(image);
- error = copy_from_user(image, rq->ifr_data, EEPROM_BYTES);
- if (error) {
- error = -EFAULT;
- goto wf_out;
+ oldimage = kmalloc(EEPROM_BYTES, GFP_KERNEL);
+ if (!oldimage) {
+ kfree(image);
+ return -ENOMEM;
}
if (rrpriv->fw_running){
--
2.9.3
next prev parent reply other threads:[~2017-05-06 15:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-06 15:42 [PATCH] agp: " Geliang Tang
2017-05-06 15:42 ` Geliang Tang [this message]
2017-05-08 19:02 ` [PATCH] net/hippi/rrunner: " David Miller
2017-05-06 15:42 ` [PATCH] spi: spidev: " Geliang Tang
2017-05-08 9:28 ` Geert Uytterhoeven
2017-05-15 8:05 ` Applied "spi: spidev: use memdup_user" to the spi tree Mark Brown
2017-05-06 15:42 ` [PATCH] usb: cdc-wdm: use memdup_user Geliang Tang
2017-05-06 17:40 ` Bjørn Mork
2017-05-08 15:14 ` [PATCH v2] " Geliang Tang
2017-05-09 7:50 ` Oliver Neukum
2017-05-06 15:42 ` [PATCH] wil6210: " Geliang Tang
2017-05-19 7:55 ` Kalle Valo
2017-05-06 15:42 ` [PATCH] wlcore: " Geliang Tang
2017-05-18 13:41 ` Kalle Valo
2017-05-06 15:42 ` [PATCH] xfrm: " Geliang Tang
2017-05-16 9:30 ` Steffen Klassert
2017-05-06 15:42 ` [PATCH] yam: " Geliang Tang
2017-05-08 19:02 ` David Miller
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=58733b05cfe6248e30471a59ad1faee7f2f71280.1493780932.git.geliangtang@gmail.com \
--to=geliangtang@gmail.com \
--cc=jes@trained-monkey.org \
--cc=linux-hippi@sunsite.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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
all inboxes | Powered by JetHome®