[dpdk-dev,v3] librte_eal: fix wrong assert for arm and ppc

Message ID 20170925073441.23494-1-lma@semihalf.com (mailing list archive)
State Superseded, archived
Headers

Checks

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

Commit Message

Lukasz Majczak Sept. 25, 2017, 7:34 a.m. UTC
  The assertion of return value from the open() function is done against
0, while it is a correct value - open() returns -1 in case of an error.
It causes problems while trying to run as a daemon, in which case, this
call to open() will return 0 as a valid descriptor.

Fixes: b94e5c9406b5 ("eal/arm: add CPU flags for ARMv7")
Fixes: 97523f822ba9 ("eal/arm: add CPU flags for ARMv8")
Fixes: 9ae155385686 ("eal/ppc: cpu flag checks for IBM Power")

Signed-off-by: Lukasz Majczak <lma@semihalf.com>
---
 lib/librte_eal/common/arch/arm/rte_cpuflags.c    | 2 +-
 lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Chao Zhu Sept. 28, 2017, 2:01 a.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Lukasz Majczak
> Sent: 2017年9月25日 15:35
> To: dev@dpdk.org
> Cc: Lukasz Majczak <lma@semihalf.com>
> Subject: [dpdk-dev] [PATCH v3] librte_eal: fix wrong assert for arm and
ppc
> 
> The assertion of return value from the open() function is done against 0,
while it
> is a correct value - open() returns -1 in case of an error.
> It causes problems while trying to run as a daemon, in which case, this
call to
> open() will return 0 as a valid descriptor.
> 
> Fixes: b94e5c9406b5 ("eal/arm: add CPU flags for ARMv7")
> Fixes: 97523f822ba9 ("eal/arm: add CPU flags for ARMv8")
> Fixes: 9ae155385686 ("eal/ppc: cpu flag checks for IBM Power")
> 
> Signed-off-by: Lukasz Majczak <lma@semihalf.com>
> ---
>  lib/librte_eal/common/arch/arm/rte_cpuflags.c    | 2 +-
>  lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_eal/common/arch/arm/rte_cpuflags.c
> b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
> index 5636e9c1d..88f1cbe37 100644
> --- a/lib/librte_eal/common/arch/arm/rte_cpuflags.c
> +++ b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
> @@ -137,7 +137,7 @@ rte_cpu_get_features(hwcap_registers_t out)
>  	_Elfx_auxv_t auxv;
> 
>  	auxv_fd = open("/proc/self/auxv", O_RDONLY);
> -	assert(auxv_fd);
> +	assert(auxv_fd != -1);
>  	while (read(auxv_fd, &auxv, sizeof(auxv)) == sizeof(auxv)) {
>  		if (auxv.a_type == AT_HWCAP) {
>  			out[REG_HWCAP] = auxv.a_un.a_val;
> diff --git a/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
> b/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
> index fcf96e045..970a61c5e 100644
> --- a/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
> +++ b/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
> @@ -108,7 +108,7 @@ rte_cpu_get_features(hwcap_registers_t out)
>  	Elf64_auxv_t auxv;
> 
>  	auxv_fd = open("/proc/self/auxv", O_RDONLY);
> -	assert(auxv_fd);
> +	assert(auxv_fd != -1);
>  	while (read(auxv_fd, &auxv,
>  		sizeof(Elf64_auxv_t)) == sizeof(Elf64_auxv_t)) {
>  		if (auxv.a_type == AT_HWCAP)
> --
> 2.14.1
Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com>
  

Patch

diff --git a/lib/librte_eal/common/arch/arm/rte_cpuflags.c b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
index 5636e9c1d..88f1cbe37 100644
--- a/lib/librte_eal/common/arch/arm/rte_cpuflags.c
+++ b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
@@ -137,7 +137,7 @@  rte_cpu_get_features(hwcap_registers_t out)
 	_Elfx_auxv_t auxv;
 
 	auxv_fd = open("/proc/self/auxv", O_RDONLY);
-	assert(auxv_fd);
+	assert(auxv_fd != -1);
 	while (read(auxv_fd, &auxv, sizeof(auxv)) == sizeof(auxv)) {
 		if (auxv.a_type == AT_HWCAP) {
 			out[REG_HWCAP] = auxv.a_un.a_val;
diff --git a/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c b/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
index fcf96e045..970a61c5e 100644
--- a/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
+++ b/lib/librte_eal/common/arch/ppc_64/rte_cpuflags.c
@@ -108,7 +108,7 @@  rte_cpu_get_features(hwcap_registers_t out)
 	Elf64_auxv_t auxv;
 
 	auxv_fd = open("/proc/self/auxv", O_RDONLY);
-	assert(auxv_fd);
+	assert(auxv_fd != -1);
 	while (read(auxv_fd, &auxv,
 		sizeof(Elf64_auxv_t)) == sizeof(Elf64_auxv_t)) {
 		if (auxv.a_type == AT_HWCAP)