mnl: mnl_batch_talk() returns -1 on internal netlink errors

Display an error in case internal netlink plumbing hits problems.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/libnftables.c b/src/libnftables.c
index a58b8ca9dcf6445d1be6a0ece5754ff8cf390b2e..d8de89ca509cd288fde3dd67a30c33676ba7b5f4 100644 (file)
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -58,6 +58,14 @@ static int nft_netlink(struct nft_ctx *nft,
                goto out;
 
        ret = mnl_batch_talk(&ctx, &err_list, num_cmds);
+       if (ret < 0) {
+               netlink_io_error(&ctx, NULL,
+                                "Could not process rule: %s", strerror(errno));
+               goto out;
+       }
+
+       if (!list_empty(&err_list))
+               ret = -1;
 
        list_for_each_entry_safe(err, tmp, &err_list, head) {
                list_for_each_entry(cmd, cmds, list) {

diff --git a/src/mnl.c b/src/mnl.c
index 4f6f43d23916e808970cbb915532ef50767230c8..4eba2789513d7d03c9c67da4c304d5f1a8487338 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -317,7 +317,6 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
        struct iovec iov[iov_len];
        struct msghdr msg = {};
        fd_set readfds;
-       int err = 0;
 
        mnl_set_sndbuffer(ctx->nft->nf_sock, ctx->batch);
 
@@ -347,10 +346,8 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
 
                ret = mnl_cb_run(rcv_buf, ret, 0, portid, &netlink_echo_callback, ctx);
                /* Continue on error, make sure we get all acknowledgments */
-               if (ret == -1) {
+               if (ret == -1)
                        mnl_err_list_node_add(err_list, errno, nlh->nlmsg_seq);
-                       err = -1;
-               }
 
                ret = select(fd+1, &readfds, NULL, NULL, &tv);
                if (ret == -1)
@@ -359,7 +356,7 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list,
                FD_ZERO(&readfds);
                FD_SET(fd, &readfds);
        }
-       return err;
+       return 0;
 }
 
 int mnl_nft_rule_add(struct netlink_ctx *ctx, const struct cmd *cmd,