diff mbox

[dpdk-dev,v2] net/failsafe: fix blank line parsing

Message ID e9354faa7de5fcf5e8fc9606b62c2e64029fecf1.1501772768.git.gaetan.rivet@6wind.com (mailing list archive)
State Accepted, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Gaëtan Rivet Aug. 3, 2017, 3:08 p.m. UTC 
  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 <gaetan.rivet@6wind.com>
---

This patch depends on:

net/failsafe: fix for missing pclose after popen
http://dpdk.org/ml/archives/dev/2017-August/072429.html

v2:

  - Remove useless, unposix use of strnlen

 drivers/net/failsafe/failsafe_args.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Thomas Monjalon Aug. 3, 2017, 8:34 p.m. UTC | #1 
03/08/2017 17:08, Gaetan Rivet:
> 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 <gaetan.rivet@6wind.com>

Applied, thanks
diff mbox

Patch

diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c
index 3f92a77..1f22416 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 (output[0] == '\0') {
+		ret = -ENODEV;
+		goto ret_pclose;
+	}
 	ret = fs_parse_device(sdev, output);
 	if (ret) {
 		ERROR("Parsing device '%s' failed", output);