From: Haishuang Yan <yanhaishu...@cmss.chinamobile.com> Upstream commit: commit ac71b46efd2838c02ec193987c8f61c3ba33b495 Author: Haishuang Yan <yanhaishu...@cmss.chinamobile.com> Date: Mon Mar 28 18:08:59 2016 +0800
openvswitch: Use proper buffer size in nla_memcpy For the input parameter count, it's better to use the size of destination buffer size, as nla_memcpy would take into account the length of the source netlink attribute when a data is copied from an attribute. Signed-off-by: Haishuang Yan <yanhaishu...@cmss.chinamobile.com> Signed-off-by: David S. Miller <da...@davemloft.net> Signed-off-by: Jarno Rajahalme <ja...@ovn.org> Fixes: c5f6c06b58d6 ("datapath: Interface with NAT.") Signed-off-by: Jarno Rajahalme <ja...@ovn.org> --- datapath/conntrack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index 4b3b78e..adb3564 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -980,7 +980,8 @@ static int parse_nat(const struct nlattr *attr, break; case OVS_NAT_ATTR_IP_MIN: - nla_memcpy(&info->range.min_addr, a, nla_len(a)); + nla_memcpy(&info->range.min_addr, a, + sizeof(info->range.min_addr)); info->range.flags |= NF_NAT_RANGE_MAP_IPS; break; -- 2.1.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev