From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kamala Narasimhan <kamala.narasimhan@gmail.com>
Subject: Re: [PATCH] xl: Perform minimal validation of virtual
	disk file while parsing config file
Date: Wed, 26 Jan 2011 13:02:05 -0500
Message-ID: <4D40619D.40806@gmail.com>
References: <AANLkTimSUym0u+SNm0AvNp3AZQQFspetAaXmNShkPJd4@mail.gmail.com>	<1294995912.8240.86.camel@zakaz.uk.xensource.com>	<AANLkTikfUHHc+-gVkgnRJc722wObLF3TumpK5WSfJVAE@mail.gmail.com>	<1295024348.12018.222.camel@qabil.uk.xensource.com>	<AANLkTikf3TVJwE_N-OyuS-UhyA8+cgzAG__9hz3AETeM@mail.gmail.com>	<AANLkTinJ=PYsC6vbPvU8g2T8NmyohLa=4rd9zfhTMCCO@mail.gmail.com>	<AANLkTin1AGxH26158mn37_Oar1PgSSJoJOnGHs+XnxsV@mail.gmail.com>	<19768.22912.878633.622270@mariner.uk.xensource.com>	<AANLkTinnrmAxaOVu1fN2qt4N2t-EzpF31sKE-Jpn-y2f@mail.gmail.com>	<AANLkTi=1b+amdCA4A3AKxAnR6C65xv2+O3BNbGsp-T7i@mail.gmail.com>	<19769.31094.274199.464586@mariner.uk.xensource.com>	<1295616468.12018.352.camel@qabil.uk.xensource.com>	<4D3A4203.2050706@gmail.com>	<19775.4623.927492.247420@mariner.uk.xensource.com>	<AANLk
 Tike5rxaw4QpOVzh0p9_qX6fGebUri_WNROQEsNf@mail.gmail.com>
	<19776.2283.897281.370509@mariner.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <19776.2283.897281.370509@mariner.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Ian Campbell <Ian.Campbell@eu.citrix.com>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Gianni Tedesco <gianni.tedesco@citrix.com>, Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

Here is a patch that special cases tap/aio during validation.

I am not taking into account qcow and qcow2 as I hear they are broken with tap and shouldn't be used for that reason.

Signed-off-by: Kamala Narasimhan <kamala.narasimhan@citrix.com>

Kamala

diff -r 67d5b8004947 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Wed Jan 26 11:58:45 2011 +0000
+++ b/tools/libxl/libxl.c       Wed Jan 26 12:07:54 2011 -0500
@@ -836,22 +836,26 @@ static int validate_virtual_disk(libxl_c
 static int validate_virtual_disk(libxl_ctx *ctx, char *file_name, libxl_disk_phystype disk_type)
 {
     struct stat stat_buf;
+    int count = 0;

     if ( (file_name[0] == '\0') && (disk_type == PHYSTYPE_EMPTY) )
         return 0;

-    if ( stat(file_name, &stat_buf) != 0 ) {
-        LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to stat %s", file_name);
+    if ( disk_type == PHYSTYPE_AIO )
+        count = strlen("vhd:");
+
+    if ( stat(&file_name[count], &stat_buf) != 0 ) {
+        LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to stat %s", &file_name[count]);
         return ERROR_INVAL;
     }
     if ( disk_type == PHYSTYPE_PHY ) {
         if ( !(S_ISBLK(stat_buf.st_mode)) ) {
             LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual disk %s is not a block device!\n",
-                file_name);
+                &file_name[count]);
             return ERROR_INVAL;
         }
     } else if ( S_ISREG(stat_buf.st_mode) && stat_buf.st_size == 0 ) {
-        LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual disk %s size is 0!\n", file_name);
+        LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Virtual disk %s size is 0!\n", &file_name[count]);
         return ERROR_INVAL;
     }