]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: unisys: visorhba: fix s-Par to boot with option CONFIG_VMAP_STACK set to y
authorSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Tue, 18 Apr 2017 20:55:25 +0000 (16:55 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Apr 2017 09:55:53 +0000 (11:55 +0200)
The root issue is that we are not allowed to have items on the
stack being passed to "DMA" like operations. In this case we have
a vmcall and an inline completion of scsi command.

This patch fixes the issue by moving the variables on stack in
do_scsi_nolinuxstat() to heap memory.

Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorhba/visorhba_main.c

index d3721158fc7fbb25f6f3ceba8edc5d9a005fadd6..6997b16b4dcde00ff7b1d1253be05f5a95e2a04f 100644 (file)
@@ -839,7 +839,7 @@ static void
 do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
 {
        struct scsi_device *scsidev;
-       unsigned char buf[36];
+       unsigned char *buf;
        struct scatterlist *sg;
        unsigned int i;
        char *this_page;
@@ -854,6 +854,10 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
                if (cmdrsp->scsi.no_disk_result == 0)
                        return;
 
+               buf = kzalloc(sizeof(char) * 36, GFP_KERNEL);
+               if (!buf)
+                       return;
+
                /* Linux scsi code wants a device at Lun 0
                 * to issue report luns, but we don't want
                 * a disk there so we'll present a processor
@@ -865,6 +869,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
                if (scsi_sg_count(scsicmd) == 0) {
                        memcpy(scsi_sglist(scsicmd), buf,
                               cmdrsp->scsi.bufflen);
+                       kfree(buf);
                        return;
                }
 
@@ -876,6 +881,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
                        memcpy(this_page, buf + bufind, sg[i].length);
                        kunmap_atomic(this_page_orig);
                }
+               kfree(buf);
        } else {
                devdata = (struct visorhba_devdata *)scsidev->host->hostdata;
                for_each_vdisk_match(vdisk, devdata, scsidev) {