diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:46:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:46:57 -0700 |
| commit | c19e80808b34b3de5c20884f11f58c3b6988daff (patch) | |
| tree | 97a19986b95a23fb9da450e7d6b19fcc94ed6da9 /include | |
| parent | 344a7829c421ce6c626cb94c6576f66a7c28a871 (diff) | |
| parent | cff502a38394fd33693f6233e03fca363dfa956d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
niu: panic on reset
netlink: fix overrun in attribute iteration
[Bluetooth] Fix regression from using default link policy
ath9k: Assign seq# when mac80211 requests this
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index 18024b8cecb8..208fe5a38546 100644 --- a/include/net/netlink.h +++ b/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; } |