diff --git a/[refs] b/[refs] index 613e42e34bd7..cfa70e8f1d3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64ff3b938ec6782e6585a83d5459b98b0c3f6eb8 +refs/heads/master: 619e803d3c1b7bcc17c45e81f309d0b9b3df2d5d diff --git a/trunk/include/net/netlink.h b/trunk/include/net/netlink.h index 46b7764f1774..8a6150a3f4c7 100644 --- a/trunk/include/net/netlink.h +++ b/trunk/include/net/netlink.h @@ -332,7 +332,7 @@ static inline int nlmsg_attrlen(const struct nlmsghdr *nlh, int hdrlen) */ static inline int nlmsg_ok(const struct nlmsghdr *nlh, int remaining) { - return (remaining >= sizeof(struct nlmsghdr) && + return (remaining >= (int) sizeof(struct nlmsghdr) && nlh->nlmsg_len >= sizeof(struct nlmsghdr) && nlh->nlmsg_len <= remaining); }