Patch "rbd: Fix error recovery in rbd_obj_read_sync()" has been added to the 3.14-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    rbd: Fix error recovery in rbd_obj_read_sync()

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     rbd-fix-error-recovery-in-rbd_obj_read_sync.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From a8d4205623ae965e36c68629db306ca0695a2771 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@xxxxxxx>
Date: Wed, 22 Oct 2014 09:17:24 +0200
Subject: rbd: Fix error recovery in rbd_obj_read_sync()

From: Jan Kara <jack@xxxxxxx>

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@xxxxxxxxxxx>
CC: Sage Weil <sage@xxxxxxxxxxx>
CC: ceph-devel@xxxxxxxxxxxxxxx
Coverity-id: 1226882
Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
 drivers/block/rbd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3217,7 +3217,7 @@ static int rbd_obj_read_sync(struct rbd_
 	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,


Patches currently in stable-queue which might be from jack@xxxxxxx are

queue-3.14/ext3-don-t-check-quota-format-when-there-are-no-quota-files.patch
queue-3.14/evm-check-xattr-value-length-and-type-in-evm_inode_setxattr.patch
queue-3.14/scsi-fix-error-handling-in-scsi_ioctl_send_command.patch
queue-3.14/ext4-don-t-check-quota-format-when-there-are-no-quota-files.patch
queue-3.14/lib-bitmap.c-fix-undefined-shift-in-__bitmap_shift_-left-right.patch
queue-3.14/ext4-fix-oops-when-loading-block-bitmap-failed.patch
queue-3.14/vfs-fix-data-corruption-when-blocksize-pagesize-for-mmaped-data.patch
queue-3.14/ext4-fix-mmap-data-corruption-when-blocksize-pagesize.patch
queue-3.14/mm-remove-false-warn_on-from-pagecache_isize_extended.patch
queue-3.14/rbd-fix-error-recovery-in-rbd_obj_read_sync.patch
queue-3.14/ext4-fix-overflow-when-updating-superblock-backups-after-resize.patch
queue-3.14/ext4-grab-missed-write_count-for-ext4_ioc_swap_boot.patch
queue-3.14/quota-properly-return-errors-from-dquot_writeback_dquots.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]