diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2017-08-14 23:12:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-14 23:12:30 +0000 |
| commit | ea2f8e8ce0074d79eaee4a514750b94457d8e5ad (patch) | |
| tree | 923cf94d70b6f88d6a406005fbb9368e1b0f01c0 /net/openvswitch/conntrack.c | |
| parent | 84e1e3224b4d97bae8fd5bc6a67ab4900c4d5f21 (diff) | |
| parent | ca4226385d9c5299108e261921f9849572fd5d10 (diff) | |
| download | v4.4-ea2f8e8ce0074d79eaee4a514750b94457d8e5ad.tar.gz | |
Merge 4.4.81 into android-4.4 am: dfff30bca9
am: ca4226385d
Change-Id: Id1f751744e0dc75a6a73c19af6dda15a46d2c842
Diffstat (limited to 'net/openvswitch/conntrack.c')
| -rw-r--r-- | net/openvswitch/conntrack.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index ad58d2a6284e..6a2507f24b0f 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -577,8 +577,8 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info, nla_for_each_nested(a, attr, rem) { int type = nla_type(a); - int maxlen = ovs_ct_attr_lens[type].maxlen; - int minlen = ovs_ct_attr_lens[type].minlen; + int maxlen; + int minlen; if (type > OVS_CT_ATTR_MAX) { OVS_NLERR(log, @@ -586,6 +586,9 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info, type, OVS_CT_ATTR_MAX); return -EINVAL; } + + maxlen = ovs_ct_attr_lens[type].maxlen; + minlen = ovs_ct_attr_lens[type].minlen; if (nla_len(a) < minlen || nla_len(a) > maxlen) { OVS_NLERR(log, "Conntrack attr type has unexpected length (type=%d, length=%d, expected=%d)", |