Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits)
  [SCSI] scsi_dh: fix kconfig related build errors
  [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of
  [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h
  [SCSI] make struct scsi_{host,target}_type static
  [SCSI] fix locking in host use of blk_plug_device()
  [SCSI] zfcp: Cleanup external header file
  [SCSI] zfcp: Cleanup code in zfcp_erp.c
  [SCSI] zfcp: zfcp_fsf cleanup.
  [SCSI] zfcp: consolidate sysfs things into one file.
  [SCSI] zfcp: Cleanup of code in zfcp_aux.c
  [SCSI] zfcp: Cleanup of code in zfcp_scsi.c
  [SCSI] zfcp: Move status accessors from zfcp to SCSI include file.
  [SCSI] zfcp: Small QDIO cleanups
  [SCSI] zfcp: Adapter reopen for large number of unsolicited status
  [SCSI] zfcp: Fix error checking for ELS ADISC requests
  [SCSI] zfcp: wait until adapter is finished with ERP during auto-port
  [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver
  [SCSI] sg: Add target reset support
  [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC
  [SCSI] sd: Move scsi_disk() accessor function to sd.h
  ...

2 files changed, 34 insertions, 1 deletions

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 5fd83deab36c..a7355260cfcf 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -41,6 +41,7 @@
 #include <linux/kthread.h>
 #include <linux/semaphore.h>
 #include <asm/uaccess.h>
+#include <scsi/scsi_host.h>
 
 #include "aacraid.h"
 
@@ -581,6 +582,14 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                         for (i = 0; i < upsg->count; i++) {
                                 u64 addr;
                                 void* p;
+                                if (upsg->sg[i].count >
+                                    (dev->adapter_info.options &
+                                     AAC_OPT_NEW_COMM) ?
+                                      (dev->scsi_host_ptr->max_sectors << 9) :
+                                      65536) {
+                                        rcode = -EINVAL;
+                                        goto cleanup;
+                                }
                                 /* Does this really need to be GFP_DMA? */
                                 p = kmalloc(upsg->sg[i].count,GFP_KERNEL|__GFP_DMA);
                                 if(!p) {
@@ -625,6 +634,14 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                         for (i = 0; i < usg->count; i++) {
                                 u64 addr;
                                 void* p;
+                                if (usg->sg[i].count >
+                                    (dev->adapter_info.options &
+                                     AAC_OPT_NEW_COMM) ?
+                                      (dev->scsi_host_ptr->max_sectors << 9) :
+                                      65536) {
+                                        rcode = -EINVAL;
+                                        goto cleanup;
+                                }
                                 /* Does this really need to be GFP_DMA? */
                                 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
                                 if(!p) {
@@ -667,6 +684,14 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                         for (i = 0; i < upsg->count; i++) {
                                 uintptr_t addr;
                                 void* p;
+                                if (usg->sg[i].count >
+                                    (dev->adapter_info.options &
+                                     AAC_OPT_NEW_COMM) ?
+                                      (dev->scsi_host_ptr->max_sectors << 9) :
+                                      65536) {
+                                        rcode = -EINVAL;
+                                        goto cleanup;
+                                }
                                 /* Does this really need to be GFP_DMA? */
                                 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
                                 if(!p) {
@@ -698,6 +723,14 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                         for (i = 0; i < upsg->count; i++) {
                                 dma_addr_t addr;
                                 void* p;
+                                if (upsg->sg[i].count >
+                                    (dev->adapter_info.options &
+                                     AAC_OPT_NEW_COMM) ?
+                                      (dev->scsi_host_ptr->max_sectors << 9) :
+                                      65536) {
+                                        rcode = -EINVAL;
+                                        goto cleanup;
+                                }
                                 p = kmalloc(upsg->sg[i].count, GFP_KERNEL);
                                 if (!p) {
                                         dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 68c140e82673..9aa301c1ed07 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -865,7 +865,7 @@ static ssize_t aac_show_bios_version(struct device *device,
         return len;
 }
 
-ssize_t aac_show_serial_number(struct device *device,
+static ssize_t aac_show_serial_number(struct device *device,
                                struct device_attribute *attr, char *buf)
 {
         struct aac_dev *dev = (struct aac_dev*)class_to_shost(device)->hostdata;