From patchwork Thu Aug 3 14:52:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 27414 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 63DE2326B; Thu, 3 Aug 2017 16:52:49 +0200 (CEST) Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by dpdk.org (Postfix) with ESMTP id 295112C18 for ; Thu, 3 Aug 2017 16:52:48 +0200 (CEST) Received: by mail-wr0-f169.google.com with SMTP id 12so6727672wrb.1 for ; Thu, 03 Aug 2017 07:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=fxhhex3OSsGc3x9ZY4wvvWJHbWMGD5NJGUxzVfICsCI=; b=CaCTOzo2vD04MKNn/1N8LDhj8zLWEW1Bk0KmEet/a/rJ/dAgbqqHfGF06pr7TUJy0S /6Al5scGhwVjRMC2IIXrra4gmXeaxgspF8Su41FCiSrnMb4p0LAdNe9yqI1PlGd1D2M+ t8EG2+9EmxwbLTGGDtEkNQS56qaX8bh331lmACxYgq96PP15/+MBV3lP+qryf+z4IUcz 1gp4hcssmM+PLUc2Gy+1CGuqU3dhuCenDu+PWMTZw3n61kTS/bM1Sc0IrgK0CTYyICn1 CY78PTgn9s6ukxJLne9doLfumB1G6rjh2AEXUVdqcUUdteEkU71MFDjnE3GbbqrlYCyW 76iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fxhhex3OSsGc3x9ZY4wvvWJHbWMGD5NJGUxzVfICsCI=; b=TmLeipIEaYH31yOMT2PVYN5jUkWTV/nPpI3zSiAvzNgbwzS5W7++db6lwpZSLXunCr xfmzb97IAkadOwyc2lTZ9+S74ld0PzHKe8oQ1fa0X1grbLRbYe25G7c1GIW/i5jNvB2E KIfbTW0gy3AvrE8CIs8XHjjfXukoK7Ix6tRHmjaYIAjrtgqI14B2LoDYzquyHa+2jrY9 htwyoSAlVcG5JQXbi5ebk3dppL2gytrthUQXKkZRRJfwQDBMVsV3Cbymv1k0qSpec2SN rIA8XF36FDbwJJh45FquBAPuDdxIJPzfY1wCXAopLZLewyI2cBMctU4tQwgLosSMRNYC pOYQ== X-Gm-Message-State: AIVw112J9zy1K+/hpxHyix/2qaspT9oMJ5Jpqqr75fz9yxYJvxCDqsSF JRNnaLMXPocA4zXoONI= X-Received: by 10.223.167.9 with SMTP id c9mr1694227wrd.180.1501771967543; Thu, 03 Aug 2017 07:52:47 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id d19sm1419216wrb.93.2017.08.03.07.52.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Aug 2017 07:52:45 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 3 Aug 2017 16:52:32 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH] net/failsafe: fix blank line parsing X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When the output of an exec() slave definition is only a single newline character, the fail-safe currently fails to parse the device with the value returned by the rte_devargs library. This behavior is incorrect, because the fail-safe should make a difference between the absence of a device, and an erroneous device declaration. Fix the output sanitization in the case where no newline was at its end and detect the special case of an absent device. The correct error code is then returned. Fixes: a0194d828100 ("net/failsafe: add flexible device definition") Signed-off-by: Gaetan Rivet --- This patch depends on: net/failsafe: fix for missing pclose after popen http://dpdk.org/ml/archives/dev/2017-August/072429.html drivers/net/failsafe/failsafe_args.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c index 3f92a77..185e2c0 100644 --- a/drivers/net/failsafe/failsafe_args.c +++ b/drivers/net/failsafe/failsafe_args.c @@ -101,10 +101,11 @@ fs_parse_device(struct sub_device *sdev, char *args) static void fs_sanitize_cmdline(char *args) { - size_t len; + char *nl; - len = strnlen(args, DEVARGS_MAXLEN); - args[len - 1] = '\0'; + nl = strrchr(args, '\n'); + if (nl) + nl[0] = '\0'; } static int @@ -149,6 +150,10 @@ fs_execute_cmd(struct sub_device *sdev, char *cmdline) goto ret_pclose; } fs_sanitize_cmdline(output); + if (strnlen(output, 1) == 0) { + ret = -ENODEV; + goto ret_pclose; + } ret = fs_parse_device(sdev, output); if (ret) { ERROR("Parsing device '%s' failed", output);