Fix endless loop in netlink error handling.

diff --git a/ChangeLog b/ChangeLog
index 0b4d158a0bce6029fffd1306dc5a04cc7ff3e2d1..49a1e9cf000f538cda02ac0851d4d0ca3a279d42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
+2006-03-10  Jean Tourrilhes <jt@hpl.hp.com>
+
+       * Fix endless loop in netlink error handling
+
 2006-03-10  Russell Stuart <russell-lartc@stuart.id.au>
 
        * Fix missing memset in tc sample
 
-2006-03-10  shemminger  <shemminger@osdl.org>
+2006-03-10  Stephen Hemminger  <shemminger@osdl.org>
 
        * Change default lnstat count to 1
        * Update to 2.6.16 headers

diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 24e1f0b6f8d226da6202105eedafe0531e46d3ce..67951fe7d768398bee7d7c283e90e96d2b7f7ce5 100644 (file)
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -308,6 +308,9 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
                                        if (err < 0)
                                                return err;
                                }
+                               /* Don't forget to skip that message. */
+                               status -= NLMSG_ALIGN(len);
+                               h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
                                continue;
                        }