From 821e4111d6c7e51f4f3178e24ec6f4a4dfe2d1a5 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 11 Sep 2008 19:11:50 -0700 Subject: [PATCH] --- yaml --- r: 109813 b: refs/heads/master c: d58b622b5de9747c82fcc3548f3ec87a02c24dce h: refs/heads/master i: 109811: e15e1f35d89126a9a73feaece601a780dfd5ff53 v: v3 --- [refs] | 2 +- trunk/include/net/netlink.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 03fb6b495f31..a1c28e6ecb67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c6a329e444725f24c02192ac493d8a7cd9fa638 +refs/heads/master: d58b622b5de9747c82fcc3548f3ec87a02c24dce 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; }