rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix potential oops introduced in 2.6.38.8

Browse Source
This commit is contained in:
Chuck Ebbert 2011-06-24 00:44:32 -04:00
parent ce8c067136
commit 8744fb36ce
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
block-blkdev_get-should-access-bd_disk-only-after.patch Normal file
View File

@ -0,0 +1,40 @@
From 4c49ff3fe128ca68dabd07537415c419ad7f82f9 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 1 Jun 2011 08:27:41 +0200
Subject: block: blkdev_get() should access ->bd_disk only after
success
From: Tejun Heo <tj@kernel.org>
commit 4c49ff3fe128ca68dabd07537415c419ad7f82f9 upstream.
d4dc210f69 (block: don't block events on excl write for non-optical
devices) added dereferencing of bdev->bd_disk to test
GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE; however, bdev->bd_disk can be
%NULL if open failed which can lead to an oops.
Test the flag after testing open was successful, not before.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: David Miller <davem@davemloft.net>
Tested-by: David Miller <davem@davemloft.net>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/block_dev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1272,8 +1272,8 @@ int blkdev_get(struct block_device *bdev
* individual writeable reference is too fragile given the
* way @mode is used in blkdev_get/put().
*/
- if ((disk->flags & GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE) &&
- !res && (mode & FMODE_WRITE) && !bdev->bd_write_holder) {
+ if (!res && (mode & FMODE_WRITE) && !bdev->bd_write_holder &&
+ (disk->flags & GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE)) {
bdev->bd_write_holder = true;
disk_block_events(disk);
}

6
kernel.spec
View File

@ -658,6 +658,7 @@ Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
Patch600: block-queue-refcount.patch
Patch601: block-export-blk_-get-put-_queue.patch
Patch602: block-blkdev_get-should-access-bd_disk-only-after.patch
Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
@ -1278,10 +1279,11 @@ ApplyPatch x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch
#ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
#
# SCSI Bits.
# SCSI / block Bits.
#
ApplyPatch block-queue-refcount.patch
ApplyPatch block-export-blk_-get-put-_queue.patch
ApplyPatch block-blkdev_get-should-access-bd_disk-only-after.patch
# ACPI
@ -2025,6 +2027,8 @@ fi
%changelog
* Fri Jun 24 2011 Chuck Ebbert <cebbert@redhat.com>
- Minor cleanup: use upstream patch to export block_{get,put}_queue
- block-blkdev_get-should-access-bd_disk-only-after.patch:
fix potential oops introduced in 2.6.38.8
* Thu Jun 23 2011 Dave Airlie <airlied@redhat.com> 2.6.38.8-34
- drm-i915-snb-irq-stalls-fix.patch: fix Sandybridge IRQ stalls