From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Sat, 30 Jul 2016 00:37:57 +0000 (+0000)
Subject: libceph: fix return value check in alloc_msg_with_page_vector()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c22e853a2ed19321d00c1eae339ffdc4f5e7757e;p=linux.git

libceph: fix return value check in alloc_msg_with_page_vector()

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

Fixes: 1907920324f1 ('libceph: support for sending notifies')
Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index b5ec09612ff71..a97e7b506612b 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -4220,7 +4220,7 @@ static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr)
 
 		pages = ceph_alloc_page_vector(calc_pages_for(0, data_len),
 					       GFP_NOIO);
-		if (!pages) {
+		if (IS_ERR(pages)) {
 			ceph_msg_put(m);
 			return NULL;
 		}