diff mbox

loadpolicy: only close polFd if it is valid

Message ID 1455121959-31657-1-git-send-email-ian.campbell@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Campbell Feb. 10, 2016, 4:32 p.m. UTC 
It can be -1 at this point.

CID 1055562
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/flask/utils/loadpolicy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wei Liu Feb. 11, 2016, 11:20 a.m. UTC | #1 
On Wed, Feb 10, 2016 at 04:32:39PM +0000, Ian Campbell wrote:
> It can be -1 at this point.
> 
> CID 1055562
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

> ---
>  tools/flask/utils/loadpolicy.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/flask/utils/loadpolicy.c b/tools/flask/utils/loadpolicy.c
> index 47b5139..76710a2 100644
> --- a/tools/flask/utils/loadpolicy.c
> +++ b/tools/flask/utils/loadpolicy.c
> @@ -115,7 +115,7 @@ done:
>          if ( ret < 0 )
>              fprintf(stderr, "Unable to unmap policy memory: %s\n", strerror(errno));
>      }
> -    if ( polFd )
> +    if ( polFd >= 0 )
>          close(polFd);
>      if ( xch )
>          xc_interface_close(xch);
> -- 
> 2.1.4
>
Ian Campbell Feb. 23, 2016, 10:30 a.m. UTC | #2 
On Thu, 2016-02-11 at 11:20 +0000, Wei Liu wrote:
> On Wed, Feb 10, 2016 at 04:32:39PM +0000, Ian Campbell wrote:
> > It can be -1 at this point.
> > 
> > CID 1055562
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>

Ian, will you commit this one?
Konrad Rzeszutek Wilk Feb. 29, 2016, 3:49 p.m. UTC | #3 
On Tue, Feb 23, 2016 at 10:30:12AM +0000, Ian Campbell wrote:
> On Thu, 2016-02-11 at 11:20 +0000, Wei Liu wrote:
> > On Wed, Feb 10, 2016 at 04:32:39PM +0000, Ian Campbell wrote:
> > > It can be -1 at this point.
> > > 
> > > CID 1055562
> > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > 
> > Acked-by: Wei Liu <wei.liu2@citrix.com>
> 
> Ian, will you commit this one?

Applied.
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
diff mbox

Patch

diff --git a/tools/flask/utils/loadpolicy.c b/tools/flask/utils/loadpolicy.c
index 47b5139..76710a2 100644
--- a/tools/flask/utils/loadpolicy.c
+++ b/tools/flask/utils/loadpolicy.c
@@ -115,7 +115,7 @@  done:
         if ( ret < 0 )
             fprintf(stderr, "Unable to unmap policy memory: %s\n", strerror(errno));
     }
-    if ( polFd )
+    if ( polFd >= 0 )
         close(polFd);
     if ( xch )
         xc_interface_close(xch);