linux-kernel - [PATCH 3.12 196/206] rbd: Fix error recovery in rbd_obj_read

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <7beac9d17eed590fbb8e1217464882c2a2c58b3f.1416319692.git.jslaby@suse.cz>
Date:	Tue, 18 Nov 2014 15:09:11 +0100
From:	Jiri Slaby <jslaby@...e.cz>
To:	stable@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, Jan Kara <jack@...e.cz>,
	Yehuda Sadeh <yehuda@...tank.com>,
	Sage Weil <sage@...tank.com>, ceph-devel@...r.kernel.org,
	Ilya Dryomov <idryomov@...hat.com>, Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 196/206] rbd: Fix error recovery in rbd_obj_read_sync()

From: Jan Kara <jack@...e.cz>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit a8d4205623ae965e36c68629db306ca0695a2771 upstream.

When we fail to allocate page vector in rbd_obj_read_sync() we just
basically ignore the problem and continue which will result in an oops
later. Fix the problem by returning proper error.

CC: Yehuda Sadeh <yehuda@...tank.com>
CC: Sage Weil <sage@...tank.com>
CC: ceph-devel@...r.kernel.org
Coverity-id: 1226882
Signed-off-by: Jan Kara <jack@...e.cz>
Signed-off-by: Ilya Dryomov <idryomov@...hat.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index aeeb62e0981a..a86841886acc 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3220,7 +3220,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,
 	page_count = (u32) calc_pages_for(offset, length);
 	pages = ceph_alloc_page_vector(page_count, GFP_KERNEL);
 	if (IS_ERR(pages))
-		ret = PTR_ERR(pages);
+		return PTR_ERR(pages);
 
 	ret = -ENOMEM;
 	obj_request = rbd_obj_request_create(object_name, offset, length,
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/