diff --git a/[refs] b/[refs] index 112e68f0ac78..1906d99b8858 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69da6b87fcb270f758fe75141c32e041f8db510c +refs/heads/master: 1045b03e07d85f3545118510a587035536030c1c diff --git a/trunk/include/net/netlink.h b/trunk/include/net/netlink.h index 18024b8cecb8..208fe5a38546 100644 --- a/trunk/include/net/netlink.h +++ b/trunk/include/net/netlink.h @@ -702,7 +702,7 @@ static inline int nla_len(const struct nlattr *nla) */ static inline int nla_ok(const struct nlattr *nla, int remaining) { - return remaining >= sizeof(*nla) && + return remaining >= (int) sizeof(*nla) && nla->nla_len >= sizeof(*nla) && nla->nla_len <= remaining; }