target: Fix REPORT TARGET PORT GROUPS handling with small allocation length
This patch fixes a bug with the handling of REPORT TARGET PORT GROUPS containing a smaller allocation length than the payload requires causing memory writes beyond the end of the buffer. This patch checks for the minimum 4 byte length for the response payload length, and also checks upon each loop of T10_ALUA(su_dev)->tg_pt_gps_list to ensure the Target port group and Target port descriptor list is able to fit into the remaining allocation length. If the response payload exceeds the allocation length length, then rd_len is still increments to indicate to the initiator that the payload has been truncated. Reported-by: Roland Dreier <roland@purestorage.com> Cc: stable@kernel.org Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com>
This commit is contained in:
parent
b937d27052
commit
6b20fa9aaf
|
@ -67,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.
|
||||
|
|
Loading…
Reference in New Issue