be2net: bug fix on returning an invalid nic descriptor
In function be_get_nic_desc(), it will go through the descriptor array returned from f/w. By comparing the desc_type field, it determines whether there is a nic descriptor in the array or not. In the case of no nic descriptor, this function should return NULL. The code may return an invalide descriptor, when there is no nic descriptor in the array and the desc_count is less than MAX_RESOURCE_DESC. In this case, even there is no nic descriptor, it will still return the lase descriptor since the i doesn't equal to MAX_RESOURCE_DESC. This patch fix this issue by returning the descriptor when find it and return NULL for other cases. Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com> Reviewed-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Acked-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
547669d483
commit
950e2958a5
|
@ -2976,22 +2976,17 @@ static struct be_nic_resource_desc *be_get_nic_desc(u8 *buf, u32 desc_count,
|
|||
for (i = 0; i < desc_count; i++) {
|
||||
desc->desc_len = desc->desc_len ? : RESOURCE_DESC_SIZE;
|
||||
if (((void *)desc + desc->desc_len) >
|
||||
(void *)(buf + max_buf_size)) {
|
||||
desc = NULL;
|
||||
break;
|
||||
}
|
||||
(void *)(buf + max_buf_size))
|
||||
return NULL;
|
||||
|
||||
if (desc->desc_type == NIC_RESOURCE_DESC_TYPE_V0 ||
|
||||
desc->desc_type == NIC_RESOURCE_DESC_TYPE_V1)
|
||||
break;
|
||||
return desc;
|
||||
|
||||
desc = (void *)desc + desc->desc_len;
|
||||
}
|
||||
|
||||
if (!desc || i == MAX_RESOURCE_DESC)
|
||||
return NULL;
|
||||
|
||||
return desc;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Uses Mbox */
|
||||
|
|
Loading…
Reference in a new issue