summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorRoss Lagerwall <ross.lagerwall@citrix.com>2019-01-14 12:16:56 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-31 10:13:41 +0300
commit520126ca0ef79ecf67784b36b67601d54b0df42f (patch)
tree1750b39c8ba4b1f2e078d0647e092822bb567f55 /net
parent6da1dfff12d475a0aff984736e4806aa033df669 (diff)
downloadlinux-520126ca0ef79ecf67784b36b67601d54b0df42f.tar.xz
openvswitch: Avoid OOB read when parsing flow nlattrs
[ Upstream commit 04a4af334b971814eedf4e4a413343ad3287d9a9 ] For nested and variable attributes, the expected length of an attribute is not known and marked by a negative number. This results in an OOB read when the expected length is later used to check if the attribute is all zeros. Fix this by using the actual length of the attribute rather than the expected length. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> Acked-by: Pravin B Shelar <pshelar@ovn.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/openvswitch/flow_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index f70e9cbf33d5..e687b89dafe6 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -459,7 +459,7 @@ static int __parse_flow_nlattrs(const struct nlattr *attr,
return -EINVAL;
}
- if (!nz || !is_all_zero(nla_data(nla), expected_len)) {
+ if (!nz || !is_all_zero(nla_data(nla), nla_len(nla))) {
attrs |= 1 << type;
a[type] = nla;
}