From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Christoph Egger" <Christoph.Egger@amd.com>
Subject: [PATCH 1/2] sprintf -> snprintf transition
Date: Tue, 30 Jan 2007 16:32:07 +0100
Message-ID: <200701301632.08022.Christoph.Egger@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="Boundary-00=_4T2vF53uvh+E2YS"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/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/cgi-bin/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: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org


--Boundary-00=_4T2vF53uvh+E2YS
Content-Type: text/plain;
 charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


The x86 changes.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


--Boundary-00=_4T2vF53uvh+E2YS
Content-Type: text/x-diff;
 charset=us-ascii;
 name=xen_stringbound_x86.diff
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=xen_stringbound_x86.diff

diff -r 5e8da0663ff8 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c	Tue Jan 30 01:23:58 2007 +0000
+++ b/xen/arch/x86/setup.c	Tue Jan 30 16:13:23 2007 +0100
@@ -803,57 +803,46 @@ void arch_get_xen_caps(xen_capabilities_
 void arch_get_xen_caps(xen_capabilities_info_t info)
 {
     char *p = info;
-    int i = 0;
     int major = xen_major_version();
     int minor = xen_minor_version();
 
 #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
 
-    i = snprintf(p, sizeof(xen_capabilities_info_t),
+    p += snprintf(p, sizeof(xen_capabilities_info_t),
                  "xen-%d.%d-x86_32 ", major, minor);
-    p += i;
     if ( hvm_enabled ) {
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
 		"hvm-%d.%d-x86_32 ", major, minor);
-	p += i;
     }
 
 #elif defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
 
-    i = snprintf(p, sizeof(xen_capabilities_info_t),
+    p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                  "xen-%d.%d-x86_32p ", major, minor);
-    p += i;
     if ( hvm_enabled )
     {
-        i = snprintf(p, sizeof(xen_capabilities_info_t),
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32 ", major, minor);
-        p += i;
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32p ", major, minor);
-        p += i;
     }
 
 #elif defined(CONFIG_X86_64)
 
-    i = snprintf(p, sizeof(xen_capabilities_info_t),
+    p += snprintf(p, sizeof(xen_capabilities_info_t),
                  "xen-%d.%d-x86_64 ", major, minor);
-    p += i;
 #ifdef CONFIG_COMPAT
-    i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+    p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                 "xen-%d.%d-x86_32p ", major, minor);
-    p += i;
 #endif
     if ( hvm_enabled )
     {
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32 ", major, minor);
-        p += i;
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_32p ", major, minor);
-        p += i;
-        i = snprintf(p, sizeof(xen_capabilities_info_t) - i,
+        p += snprintf(p, sizeof(xen_capabilities_info_t) - (p - info),
                      "hvm-%d.%d-x86_64 ", major, minor);
-        p += i;
     }
 
 #else

--Boundary-00=_4T2vF53uvh+E2YS
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--Boundary-00=_4T2vF53uvh+E2YS--