From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH for-4.6 v2 4/8] xl: valid fd can be 0 in main_loadpolicy Date: Mon, 27 Jul 2015 18:45:05 +0100 Message-ID: <1438019109-31997-5-git-send-email-wei.liu2@citrix.com> References: <1438019109-31997-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZJmSm-0008GY-Vd for xen-devel@lists.xenproject.org; Mon, 27 Jul 2015 17:45:21 +0000 In-Reply-To: <1438019109-31997-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Initialise polFd to -1 before hand to avoid closing 0 by accident. Also fixed some style problems while I was there. Signed-off-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 63f80de..77cf603 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7859,7 +7859,7 @@ int main_setenforce(int argc, char **argv) int main_loadpolicy(int argc, char **argv) { const char *polFName; - int polFd = 0; + int polFd = -1; void *polMemCp = NULL; struct stat info; int ret; @@ -7871,7 +7871,7 @@ int main_loadpolicy(int argc, char **argv) polFName = argv[optind]; polFd = open(polFName, O_RDONLY); - if ( polFd < 0 ) { + if (polFd < 0) { fprintf(stderr, "Error occurred opening policy file '%s': %s\n", polFName, strerror(errno)); ret = -1; @@ -7879,7 +7879,7 @@ int main_loadpolicy(int argc, char **argv) } ret = stat(polFName, &info); - if ( ret < 0 ) { + if (ret < 0) { fprintf(stderr, "Error occurred retrieving information about" "policy file '%s': %s\n", polFName, strerror(errno)); goto done; @@ -7911,7 +7911,7 @@ int main_loadpolicy(int argc, char **argv) done: free(polMemCp); - if ( polFd > 0 ) + if (polFd >= 0) close(polFd); return ret; -- 2.1.4