Commit 3e1ed981 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller

netlink: revert broken, broken "2-clause nla_ok()"

Commit 4f7df337
"netlink: 2-clause nla_ok()" is BROKEN.

First clause tests if "->nla_len" could even be accessed at all,
it can not possibly be omitted.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a220871b
...@@ -698,7 +698,8 @@ static inline int nla_len(const struct nlattr *nla) ...@@ -698,7 +698,8 @@ static inline int nla_len(const struct nlattr *nla)
*/ */
static inline int nla_ok(const struct nlattr *nla, int remaining) static inline int nla_ok(const struct nlattr *nla, int remaining)
{ {
return nla->nla_len >= sizeof(*nla) && return remaining >= (int) sizeof(*nla) &&
nla->nla_len >= sizeof(*nla) &&
nla->nla_len <= remaining; nla->nla_len <= remaining;
} }
......
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