2010-07-07 11:12:45 +00:00
|
|
|
From: Martin Wilck <martin.wilck@fujitsu-siemens.com>
|
|
|
|
|
Subject: megaraid_mbox: Oops on SG_IO
|
|
|
|
|
References: bnc#475619
|
|
|
|
|
Patch-mainline: not yet
|
|
|
|
|
|
|
|
|
|
This patch fixes an Oops in megaraid_mbox that happens when a
|
|
|
|
|
MODE_SENSE command for a logical drive is started viaioctl(SG_IO).
|
|
|
|
|
|
|
|
|
|
The problem only occurs if the buffer specified by the user to receive
|
|
|
|
|
the mode data resides in highmem and if the buffer is aligned for
|
|
|
|
|
direct dma (no bounce buffer necessary). megaraid_mbox emulates
|
|
|
|
|
the MODE_SENSE command and writes the data using memset() directly
|
|
|
|
|
into user buffer. If the buffer is at a currently unmapped highmem
|
|
|
|
|
page, this leads to an Oops.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
drivers/scsi/megaraid/megaraid_mbox.c | 28 +++++++++++++++++++++++-----
|
|
|
|
|
1 file changed, 23 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/scsi/megaraid/megaraid_mbox.c
|
|
|
|
|
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
|
2011-04-19 20:09:59 +00:00
|
|
|
@@ -1586,13 +1586,20 @@ megaraid_mbox_build_cmd(adapter_t *adapt
|
2010-07-07 11:12:45 +00:00
|
|
|
case MODE_SENSE:
|
|
|
|
|
{
|
|
|
|
|
struct scatterlist *sgl;
|
|
|
|
|
- caddr_t vaddr;
|
|
|
|
|
+ struct page *pg;
|
|
|
|
|
+ unsigned char *vaddr;
|
|
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
|
|
|
|
sgl = scsi_sglist(scp);
|
|
|
|
|
- if (sg_page(sgl)) {
|
|
|
|
|
- vaddr = (caddr_t) sg_virt(&sgl[0]);
|
|
|
|
|
+ pg = sg_page(sgl);
|
|
|
|
|
+ if (pg) {
|
|
|
|
|
+ local_irq_save(flags);
|
|
|
|
|
+ vaddr = kmap_atomic(pg, KM_BIO_SRC_IRQ) + sgl->offset;
|
|
|
|
|
|
|
|
|
|
memset(vaddr, 0, scp->cmnd[4]);
|
|
|
|
|
+
|
|
|
|
|
+ kunmap_atomic(vaddr, KM_BIO_SRC_IRQ);
|
|
|
|
|
+ local_irq_restore(flags);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
con_log(CL_ANN, (KERN_WARNING
|
2011-04-19 20:09:59 +00:00
|
|
|
@@ -2330,9 +2337,20 @@ megaraid_mbox_dpc(unsigned long devp)
|
2010-07-07 11:12:45 +00:00
|
|
|
if (scp->cmnd[0] == INQUIRY && status == 0 && islogical == 0
|
|
|
|
|
&& IS_RAID_CH(raid_dev, scb->dev_channel)) {
|
|
|
|
|
|
|
|
|
|
+ struct page *pg;
|
|
|
|
|
+ unsigned char *vaddr;
|
|
|
|
|
+ unsigned long flags;
|
|
|
|
|
+
|
|
|
|
|
sgl = scsi_sglist(scp);
|
|
|
|
|
- if (sg_page(sgl)) {
|
|
|
|
|
- c = *(unsigned char *) sg_virt(&sgl[0]);
|
|
|
|
|
+ pg = sg_page(sgl);
|
|
|
|
|
+ if (pg) {
|
|
|
|
|
+ local_irq_save(flags);
|
|
|
|
|
+ vaddr = kmap_atomic(pg, KM_BIO_SRC_IRQ) + sgl->offset;
|
|
|
|
|
+
|
|
|
|
|
+ c = *vaddr;
|
|
|
|
|
+
|
|
|
|
|
+ kunmap_atomic(vaddr, KM_BIO_SRC_IRQ);
|
|
|
|
|
+ local_irq_restore(flags);
|
|
|
|
|
} else {
|
|
|
|
|
con_log(CL_ANN, (KERN_WARNING
|
|
|
|
|
"megaraid mailbox: invalid sg:%d\n",
|
