summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarc de Kruijf <mdekruijf@gmail.com>2009-08-26 21:28:01 (GMT)
committerThomas Graf <tgr@lsx.localdomain>2009-09-02 16:43:03 (GMT)
commit1ed227d3a9684e84b1c19e083850d5f10e94348b (patch)
treed45de62d4780b3a5eb6e0f51dbd84d63ef56cae7 /lib
parentef858fb492dfe98e3ae194264fbc73649cf8493a (diff)
downloadlibnl-1ed227d3a9684e84b1c19e083850d5f10e94348b.zip
libnl-1ed227d3a9684e84b1c19e083850d5f10e94348b.tar.gz
libnl-1ed227d3a9684e84b1c19e083850d5f10e94348b.tar.bz2
Patch for unexpectedly aligned messages
I found the following bug, where nlmsg_ok() in lib/msg.c would incorrectly return 'true' when the input argument 'remaining' was a negative number. This happens when the message is not aligned the way that libnl expects (although it is still legal). In the comparison of the signed and unsigned numbers on line 284, the signed number gets converted to an unsigned number, which is unexpected and naturally produces a bug. My patch is below. The cast is ugly, but it fixes the problem.
Diffstat (limited to 'lib')
-rw-r--r--lib/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/msg.c b/lib/msg.c
index 22761a0..9fe9d54 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -284,7 +284,7 @@ int nlmsg_valid_hdr(const struct nlmsghdr *nlh, int hdrlen)
*/
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);
}