From patchwork Wed Jun 20 07:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Buslov X-Patchwork-Id: 932057 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 419fS72Mhgz9s1B for ; Wed, 20 Jun 2018 19:20:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754574AbeFTJUC (ORCPT ); Wed, 20 Jun 2018 05:20:02 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:59405 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754342AbeFTJUA (ORCPT ); Wed, 20 Jun 2018 05:20:00 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from vladbu@mellanox.com) with ESMTPS (AES256-SHA encrypted); 20 Jun 2018 10:27:09 +0300 Received: from reg-r-vrt-018-180.mtr.labs.mlnx (reg-r-vrt-018-180.mtr.labs.mlnx [10.213.18.180]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w5K7Objn003526; Wed, 20 Jun 2018 10:24:37 +0300 From: Vlad Buslov To: netdev@vger.kernel.org Cc: chrism@mellanox.com, Vlad Buslov Subject: [PATCH] tc: fix batch force option Date: Wed, 20 Jun 2018 10:24:21 +0300 Message-Id: <1529479461-32048-1-git-send-email-vladbu@mellanox.com> X-Mailer: git-send-email 2.7.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- tc/tc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tc/tc.c b/tc/tc.c index 0d223281ba25..62d54186ec66 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) { + err = rtnl_talk_iov(&rth, iovs, batchsize, NULL); + put_batch_bufs(&buf_pool, &head, &tail); + free(iovs); + if (err < 0) { fprintf(stderr, "Command failed %s:%d\n", name, - cmdlineno - (batchsize + ret) - 1); - return 2; + cmdlineno - (batchsize + err) - 1); + ret = 1; + if (!force) + break; } - put_batch_bufs(&buf_pool, &head, &tail); batchsize = 0; - free(iovs); } } while (!lastline);