| commit | d58b622b5de9747c82fcc3548f3ec87a02c24dce | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Sep 11 19:11:50 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Sep 11 19:11:50 2008 -0700 |
| tree | ecdd2bc45ab13e3450221fcfaaedd5d286747fad | |
| parent | 1045b03e07d85f3545118510a587035536030c1c [diff] | |
| parent | 7c6a329e444725f24c02192ac493d8a7cd9fa638 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
diff --git a/include/net/netlink.h b/include/net/netlink.h index 18024b8..208fe5a 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h
@@ -702,7 +702,7 @@ */ 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; }