From 26f85bf14573e7477abe82143dc6ef71509184b2 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 3 Jun 2015 13:29:56 -0400
Subject: [PATCH] LU-4423 lnet: fix return value check in lnet_sock_ioctl()

Linux-commit: b3c1afd1fa366ef733a9f16c493a03396d7e4ab5

In case of error, the function sock_alloc_file() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Change-Id: Ib1e04da4ab2d637a632f0b4e84f38ed6b114e27e
Reviewed-on: http://review.whamcloud.com/15125
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Isaac Huang <he.huang@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lnet/lnet/lib-socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnet/lnet/lib-socket.c b/lnet/lnet/lib-socket.c
index 0b6fc00..70b9ee23 100644
--- a/lnet/lnet/lib-socket.c
+++ b/lnet/lnet/lib-socket.c
@@ -89,8 +89,8 @@ lnet_sock_ioctl(int cmd, unsigned long arg)
 	sock_filp = sock_alloc_file(sock, 0);
 # endif
 #endif
-	if (!sock_filp) {
-		rc = -ENOMEM;
+	if (IS_ERR(sock_filp)) {
+		rc = PTR_ERR(sock_filp);
 		sock_release(sock);
 		goto out;
 	}
-- 
1.8.3.1