diff mbox

[ndctl] ndctl: fix ordering of closing vs invalidating flush_fd

Message ID 20180416170338.32734-1-vishal.l.verma@intel.com
State New, archived
Headers show

Commit Message

Verma, Vishal L April 16, 2018, 5:03 p.m. UTC
Static analysis warns that we may be closing a negative 'fd'. Fix this
by closing before invalidating the flush_fd with a -1 in add_region()

Fixes: commit c64cc15 ("ndctl: add support in libndctl to provide deep flush")
Cc: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 ndctl/lib/libndctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiang, Dave April 16, 2018, 5:05 p.m. UTC | #1
On 04/16/2018 10:03 AM, Vishal Verma wrote:
> Static analysis warns that we may be closing a negative 'fd'. Fix this
> by closing before invalidating the flush_fd with a -1 in add_region()
> 
> Fixes: commit c64cc15 ("ndctl: add support in libndctl to provide deep flush")
> Cc: Dave Jiang <dave.jiang@intel.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

Good catch!

Acked-by: Dave Jiang <dave.jiang@intel.com>

> ---
>  ndctl/lib/libndctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
> index ad5ab9a..59ea82a 100644
> --- a/ndctl/lib/libndctl.c
> +++ b/ndctl/lib/libndctl.c
> @@ -1929,8 +1929,8 @@ static void *add_region(void *parent, int id, const char *region_base)
>  
>  	perm = strtol(buf, NULL, 0);
>  	if (perm == 0) {
> -		region->flush_fd = -1;
>  		close(region->flush_fd);
> +		region->flush_fd = -1;
>  	}
>  
>   out:
>
diff mbox

Patch

diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
index ad5ab9a..59ea82a 100644
--- a/ndctl/lib/libndctl.c
+++ b/ndctl/lib/libndctl.c
@@ -1929,8 +1929,8 @@  static void *add_region(void *parent, int id, const char *region_base)
 
 	perm = strtol(buf, NULL, 0);
 	if (perm == 0) {
-		region->flush_fd = -1;
 		close(region->flush_fd);
+		region->flush_fd = -1;
 	}
 
  out: