From b133392468d1f404077a8f3554d1f63d48bb45e8 Mon Sep 17 00:00:00 2001 From: Vlad Buslov Date: Wed, 20 Jun 2018 10:24:21 +0300 Subject: [PATCH] tc: fix batch force option When sending accumulated compound command results an error, check 'force' option before exiting. Move return code check after putting batch bufs and freeing iovs to prevent memory leak. Break from loop, instead of returning error code to allow cleanup at the end of batch function. Don't reset ret code on each iteration. Fixes: 485d0c6001c4 ("tc: Add batchsize feature for filter and actions") Reviewed-by: Roi Dayan Reviewed-by: Chris Mi Signed-off-by: Vlad Buslov Signed-off-by: Stephen Hemminger --- tc/tc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tc/tc.c b/tc/tc.c index 0d223281..62d54186 100644 --- a/tc/tc.c +++ b/tc/tc.c @@ -331,6 +331,7 @@ static int batch(const char *name) int batchsize = 0; size_t len = 0; int ret = 0; + int err; bool send; batch_mode = 1; @@ -399,9 +400,9 @@ static int batch(const char *name) continue; /* blank line */ } - ret = do_cmd(largc, largv, tail == NULL ? NULL : tail->buf, + err = do_cmd(largc, largv, tail == NULL ? NULL : tail->buf, tail == NULL ? 0 : sizeof(tail->buf)); - if (ret != 0) { + if (err != 0) { fprintf(stderr, "Command failed %s:%d\n", name, cmdlineno - 1); ret = 1; @@ -423,15 +424,17 @@ static int batch(const char *name) iov->iov_len = n->nlmsg_len; } - ret = rtnl_talk_iov(&rth, iovs, batchsize, NULL); - if (ret < 0) { - fprintf(stderr, "Command failed %s:%d\n", name, - cmdlineno - (batchsize + ret) - 1); - return 2; - } + err = rtnl_talk_iov(&rth, iovs, batchsize, NULL); put_batch_bufs(&buf_pool, &head, &tail); - batchsize = 0; free(iovs); + if (err < 0) { + fprintf(stderr, "Command failed %s:%d\n", name, + cmdlineno - (batchsize + err) - 1); + ret = 1; + if (!force) + break; + } + batchsize = 0; } } while (!lastline);