Fix bad returned value

In case of error the message will be always truncated. We check the message was truncated with the total size received which means the kernel as more info to give. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Fix bad returned value
e239ff31 · Daniel Lezcano · 96bcd56a · e239ff31
Commit e239ff31 authored Jul 23, 2010 by Daniel Lezcano
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

nl.c src/lxc/nl.c +4 -4

No files found.
--- a/src/lxc/nl.c
+++ b/src/lxc/nl.c
@@ -155,7 +155,8 @@ again:
 	if (!ret)
 		return 0;

-	if (msg.msg_flags & MSG_TRUNC)
+	if (msg.msg_flags & MSG_TRUNC &&
+	    ret == answer->nlmsghdr.nlmsg_len)
 		return -EMSGSIZE;

 	return ret;
@@ -182,9 +183,8 @@ extern int netlink_send(struct nl_handler *handler, struct nlmsg *nlmsg)
        nladdr.nl_groups = 0;

 	ret = sendmsg(handler->fd, &msg, 0);
-	if (ret < 0) {
+	if (ret < 0)
 		return -errno;
-	}

 	return ret;
 }
@@ -209,7 +209,7 @@ extern int netlink_transaction(struct nl_handler *handler,
 		struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(answer);
 		return err->error;
 	}
-	
+
 	return 0;
 }