Merge http://sucs.org/~rohan/git/gfs2-3.0-nmw

[~andy/linux] / drivers / target / target_core_alua.c

diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 98c98a3a0250c9c9b74a373ea346e58a15b32844..8f4447749c7141f245137cddca5bc44ca4d9da48 100644 (file)
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -24,7 +24,6 @@
  *
  ******************************************************************************/
 
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/configfs.h>
@@ -68,12 +67,32 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
        unsigned char *buf;
        u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first
                                    Target port group descriptor */
+       /*
+        * Need at least 4 bytes of response data or else we can't
+        * even fit the return data length.
+        */
+       if (cmd->data_length < 4) {
+               pr_warn("REPORT TARGET PORT GROUPS allocation length %u"
+                       " too small\n", cmd->data_length);
+               return -EINVAL;
+       }
 
        buf = transport_kmap_first_data_page(cmd);
 
        spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
        list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
                        tg_pt_gp_list) {
+               /*
+                * Check if the Target port group and Target port descriptor list
+                * based on tg_pt_gp_members count will fit into the response payload.
+                * Otherwise, bump rd_len to let the initiator know we have exceeded
+                * the allocation length and the response is truncated.
+                */
+               if ((off + 8 + (tg_pt_gp->tg_pt_gp_members * 4)) >
+                    cmd->data_length) {
+                       rd_len += 8 + (tg_pt_gp->tg_pt_gp_members * 4);
+                       continue;
+               }
                /*
                 * PREF: Preferred target port bit, determine if this
                 * bit should be set for port group.