From e15e1f35d89126a9a73feaece601a780dfd5ff53 Mon Sep 17 00:00:00 2001 From: Vegard Nossum Date: Thu, 11 Sep 2008 19:05:29 -0700 Subject: [PATCH] --- yaml --- r: 109811 b: refs/heads/master c: 1045b03e07d85f3545118510a587035536030c1c h: refs/heads/master i: 109809: 7dc046b199770cea96de826b45b39423d7475be6 109807: eedee3b74b3862c682a2aaa62410a74dee9a32a5 v: v3 --- [refs] | 2 +- trunk/include/net/netlink.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; }