[iscsi-initiator-utils: 75/109] Resolves: #736116

[Chris Leech]

commit 7b5a0052c79a1b82f0a63b34b259beffaa18e928
Author: mchristi <mchristi at redhat.com>
Date:   Wed Sep 21 07:55:30 2011 +0000

    Resolves: #736116

 iscsi-initiator-utils-fix-nlmsglen.patch |   12 ++++++++++++
 iscsi-initiator-utils.spec               |   12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/iscsi-initiator-utils-fix-nlmsglen.patch b/iscsi-initiator-utils-fix-nlmsglen.patch
new file mode 100644
index 0000000..5f61d03
--- /dev/null
+++ b/iscsi-initiator-utils-fix-nlmsglen.patch
@@ -0,0 +1,12 @@
+diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.test/usr/netlink.c
+--- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c	2011-09-20 18:01:34.000000000 -0500
++++ open-iscsi-2.0-872-rc4-bnx2i.test/usr/netlink.c	2011-09-20 18:01:54.000000000 -0500
+@@ -185,7 +185,7 @@ kwritev(enum iscsi_uevent_e type, struct
+ 	for (i = 1; i < count; i++)
+ 		datalen += iovp[i].iov_len;
+ 
+-	nlh->nlmsg_len = NLMSG_ALIGN(datalen);
++	nlh->nlmsg_len = datalen + sizeof(*nlh);
+ 	nlh->nlmsg_pid = getpid();
+ 	nlh->nlmsg_flags = 0;
+ 	nlh->nlmsg_type = type;
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index cea5cd5..dfff729 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 26%{?dist}
+Release: 27%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -39,8 +39,10 @@ Patch12: iscsi-initiator-utils-fix-iscsiadm-return.patch
 Patch13: iscsi-initiator-utils-dont-use-openssl.patch
 # sync uio to 0.7.0.14
 Patch14: iscsi-initiator-utils-sync-uio-0.7.0.14.patch
+# fix nl msglen
+Patch15: iscsi-initiator-utils-fix-nlmsglen.patch
 # add rhel version info to iscsi tools
-Patch15: iscsi-initiator-utils-add-rh-ver.patch
+Patch16: iscsi-initiator-utils-add-rh-ver.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -83,7 +85,8 @@ developing applications that use %{name}.
 %patch12 -p1 -b .fix-iscsiadm-return
 %patch13 -p1 -b .dont-use-openssl
 %patch14 -p1 -b .sync-uio-0.7.0.14
-%patch15 -p1 -b .add-rh-ver
+%patch15 -p1 -b .fix-nlmsglen
+%patch16 -p1 -b .add-rh-ver
 
 %build
 cd utils/open-isns
@@ -206,6 +209,9 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Thu Sep 20 2011 Mike Christie <mcrhsit at redhat.com> 6.2.0.872.27
+- 736116 Fix netlink msg len
+
 * Thu Sep 8 2011 Mike Christie <mcrhsit at redhat.com> 6.2.0.872.26
 - Fix offload removal patch