aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/enic/vnic_vic.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/enic/vnic_vic.c
index 197c9d24af82..4725b79de0ef 100644
--- a/drivers/net/enic/vnic_vic.c
+++ b/drivers/net/enic/vnic_vic.c
@@ -54,8 +54,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
54 if (!vp || !value) 54 if (!vp || !value)
55 return -EINVAL; 55 return -EINVAL;
56 56
57 if (ntohl(vp->length) + sizeof(*tlv) + length > 57 if (ntohl(vp->length) + offsetof(struct vic_provinfo_tlv, value) +
58 VIC_PROVINFO_MAX_TLV_DATA) 58 length > VIC_PROVINFO_MAX_TLV_DATA)
59 return -ENOMEM; 59 return -ENOMEM;
60 60
61 tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv + 61 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 memcpy(tlv->value, value, length); 66 memcpy(tlv->value, value, length);
67 67
68 vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1); 68 vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1);
69 vp->length = htonl(ntohl(vp->length) + sizeof(*tlv) + length); 69 vp->length = htonl(ntohl(vp->length) +
70 offsetof(struct vic_provinfo_tlv, value) + length);
70 71
71 return 0; 72 return 0;
72} 73}