Commit 7c46835e authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller

enic: Use offsetof macro in vic tlv length calculation

Signed-off-by: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae94abe1
...@@ -54,8 +54,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length, ...@@ -54,8 +54,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
if (!vp || !value) if (!vp || !value)
return -EINVAL; return -EINVAL;
if (ntohl(vp->length) + sizeof(*tlv) + length > if (ntohl(vp->length) + offsetof(struct vic_provinfo_tlv, value) +
VIC_PROVINFO_MAX_TLV_DATA) length > VIC_PROVINFO_MAX_TLV_DATA)
return -ENOMEM; return -ENOMEM;
tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv + tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv +
...@@ -66,7 +66,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length, ...@@ -66,7 +66,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
memcpy(tlv->value, value, length); memcpy(tlv->value, value, length);
vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1); vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1);
vp->length = htonl(ntohl(vp->length) + sizeof(*tlv) + length); vp->length = htonl(ntohl(vp->length) +
offsetof(struct vic_provinfo_tlv, value) + length);
return 0; return 0;
} }
......
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