From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Fri, 4 Sep 2015 10:04:15 +0000 (+0530)
Subject: staging: wilc1000: fix freeing of ERR_PTR
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=360e27a91dd25fb7cf3b2befa1e1a7b4f27828d2;p=linux-beck.git

staging: wilc1000: fix freeing of ERR_PTR

If memdup_user() fails then it will return the error code in ERR_PTR. We
were checking it with IS_ERR but then again trying to free it on the
error path.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index c90c45907422..020ed038130f 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -2116,10 +2116,8 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 		if (size && wrq->u.data.pointer) {
 
 			buff = memdup_user(wrq->u.data.pointer, wrq->u.data.length);
-			if (IS_ERR(buff)) {
-				s32Error = PTR_ERR(buff);
-				goto done;
-			}
+			if (IS_ERR(buff))
+				return PTR_ERR(buff);
 
 			if (strncasecmp(buff, "RSSI", length) == 0) {