commit 3dabdbb3da5ab7e9df8bf561602d681db26d8982
author net[shemminger]!shemminger <net[shemminger]!shemminger> Wed Mar 30 18:18:12 2005 +0000
committer net[shemminger]!shemminger <net[shemminger]!shemminger> Wed Mar 30 18:18:12 2005 +0000
tree 8892ba72de68ece720d9bacf29e53ae790cedf8f
parent 56eb94cca619d6c28b9e65721867af2dac75ae94

Import patch netlink-align

(Logical change 1.179)

lib/libnetlink.c

diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 4cd2b2a..6ec2509 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -491,7 +491,7 @@
 	int len = RTA_LENGTH(alen);
 	struct rtattr *rta;
 
-	if (NLMSG_ALIGN(n->nlmsg_len) + len > maxlen) {
+	if (NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) {
 		fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen);
 		return -1;
 	}
@@ -499,7 +499,7 @@
 	rta->rta_type = type;
 	rta->rta_len = len;
 	memcpy(RTA_DATA(rta), data, alen);
-	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + len;
+	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
 	return 0;
 }
 
@@ -539,7 +539,7 @@
 	struct rtattr *subrta;
 	int len = RTA_LENGTH(alen);
 
-	if (RTA_ALIGN(rta->rta_len) + len > maxlen) {
+	if (RTA_ALIGN(rta->rta_len) + RTA_ALIGN(len) > maxlen) {
 		fprintf(stderr,"rta_addattr_l: Error! max allowed bound %d exceeded\n",maxlen);
 		return -1;
 	}
@@ -547,7 +547,7 @@
 	subrta->rta_type = type;
 	subrta->rta_len = len;
 	memcpy(RTA_DATA(subrta), data, alen);
-	rta->rta_len = NLMSG_ALIGN(rta->rta_len) + len;
+	rta->rta_len = NLMSG_ALIGN(rta->rta_len) + RTA_ALIGN(len);
 	return 0;
 }