Commit 3dd4849c authored by Manish Rangankar's avatar Manish Rangankar Committed by James Bottomley

[SCSI] qla4xxx: Fix memory corruption issue in qla4xxx_get_ep_fwdb.

In qla4xxx_get_ep_fwdb(), dst_addr is of type struct sockaddr.
We are copying sizeof(struct sockaddr_in6) bytes to dst_addr
which is 12 bytes larger. This will cause memory corruption.
So we change dst_addr to struct sockaddr_storage which is
of 128 byte, large enough to hold sizeof(struct sockaddr_in6).
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarManish Rangankar <manish.rangankar@qlogic.com>
Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ad5da8c4
...@@ -4685,7 +4685,8 @@ static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha, ...@@ -4685,7 +4685,8 @@ static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha,
struct iscsi_endpoint *ep; struct iscsi_endpoint *ep;
struct sockaddr_in *addr; struct sockaddr_in *addr;
struct sockaddr_in6 *addr6; struct sockaddr_in6 *addr6;
struct sockaddr *dst_addr; struct sockaddr *t_addr;
struct sockaddr_storage *dst_addr;
char *ip; char *ip;
/* TODO: need to destroy on unload iscsi_endpoint*/ /* TODO: need to destroy on unload iscsi_endpoint*/
...@@ -4694,21 +4695,23 @@ static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha, ...@@ -4694,21 +4695,23 @@ static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha,
return NULL; return NULL;
if (fw_ddb_entry->options & DDB_OPT_IPV6_DEVICE) { if (fw_ddb_entry->options & DDB_OPT_IPV6_DEVICE) {
dst_addr->sa_family = AF_INET6; t_addr = (struct sockaddr *)dst_addr;
t_addr->sa_family = AF_INET6;
addr6 = (struct sockaddr_in6 *)dst_addr; addr6 = (struct sockaddr_in6 *)dst_addr;
ip = (char *)&addr6->sin6_addr; ip = (char *)&addr6->sin6_addr;
memcpy(ip, fw_ddb_entry->ip_addr, IPv6_ADDR_LEN); memcpy(ip, fw_ddb_entry->ip_addr, IPv6_ADDR_LEN);
addr6->sin6_port = htons(le16_to_cpu(fw_ddb_entry->port)); addr6->sin6_port = htons(le16_to_cpu(fw_ddb_entry->port));
} else { } else {
dst_addr->sa_family = AF_INET; t_addr = (struct sockaddr *)dst_addr;
t_addr->sa_family = AF_INET;
addr = (struct sockaddr_in *)dst_addr; addr = (struct sockaddr_in *)dst_addr;
ip = (char *)&addr->sin_addr; ip = (char *)&addr->sin_addr;
memcpy(ip, fw_ddb_entry->ip_addr, IP_ADDR_LEN); memcpy(ip, fw_ddb_entry->ip_addr, IP_ADDR_LEN);
addr->sin_port = htons(le16_to_cpu(fw_ddb_entry->port)); addr->sin_port = htons(le16_to_cpu(fw_ddb_entry->port));
} }
ep = qla4xxx_ep_connect(ha->host, dst_addr, 0); ep = qla4xxx_ep_connect(ha->host, (struct sockaddr *)dst_addr, 0);
vfree(dst_addr); vfree(dst_addr);
return ep; return ep;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment