[Qemu-devel] r5531 made x509 certs not loadable [PATCH]

[Qemu-devel] r5531 made x509 certs not loadable [PATCH]

[Henrik Holst]

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

The patch in r5531 which replaced a bunch of strncpy with pstrcpy causes
the x509 credentials from the -vnc parameter to be one character shorter
than entered meaning that there is currently no way to enter x509
certificates...

The attached patch fixes this. Also the path[len]='\0' is unnecessary
now that pstrcpy is used. The problem was that the previous strncpy was
called correctly which the r5531 patch didn't think. And due to how the
code is a memcpy could probably be used instead...


Index: vnc.c
===================================================================
--- vnc.c	(revision 5668)
+++ vnc.c	(workingcopy)
@@ -2338,8 +2338,7 @@
 		int len = end ? end-(start+1) : strlen(start+1);
 		char *path = qemu_malloc(len+1);
 
-                pstrcpy(path, len, start + 1);
-		path[len] = '\0';
+                pstrcpy(path, len + 1, start + 1);
 		VNC_DEBUG("Trying certificate path '%s'\n", path);
 		if (vnc_set_x509_credential_dir(vs, path) < 0) {
 		    fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path);



/Henrik Holst
Witsbits AB

[-- Attachment #2: vnc.c.diff --]
[-- Type: text/x-patch, Size: 549 bytes --]

Index: vnc.c
===================================================================
--- vnc.c	(revision 5668)
+++ vnc.c	(arbetskopia)
@@ -2338,8 +2338,7 @@
 		int len = end ? end-(start+1) : strlen(start+1);
 		char *path = qemu_malloc(len+1);
 
-                pstrcpy(path, len, start + 1);
-		path[len] = '\0';
+                pstrcpy(path, len + 1, start + 1);
 		VNC_DEBUG("Trying certificate path '%s'\n", path);
 		if (vnc_set_x509_credential_dir(vs, path) < 0) {
 		    fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path);

Re: [Qemu-devel] r5531 made x509 certs not loadable [PATCH]

[andrzej zaborowski]

2008/11/12 Henrik Holst <henrik@witsbits.com>:
> The patch in r5531 which replaced a bunch of strncpy with pstrcpy causes
> the x509 credentials from the -vnc parameter to be one character shorter
> than entered meaning that there is currently no way to enter x509
> certificates...
>
> The attached patch fixes this. Also the path[len]='\0' is unnecessary
> now that pstrcpy is used. The problem was that the previous strncpy was
> called correctly which the r5531 patch didn't think. And due to how the
> code is a memcpy could probably be used instead...

Thanks for spotting.  I made it a qemu_strndup instead because that's
basically what's being implemented here (to be exact it could be a
memdup() here because the length is already known).  Please test.

Cheers

Re: [Qemu-devel] r5531 made x509 certs not loadable [PATCH]

[Henrik Holst]

>2008/11/12 Henrik Holst <address@hidden>:
>> The patch in r5531 which replaced a bunch of strncpy with pstrcpy causes
>> the x509 credentials from the -vnc parameter to be one character shorter
>> than entered meaning that there is currently no way to enter x509
>> certificates...
>>
>> The attached patch fixes this. Also the path[len]='\0' is unnecessary
>> now that pstrcpy is used. The problem was that the previous strncpy was
>> called correctly which the r5531 patch didn't think. And due to how the
>> code is a memcpy could probably be used instead...
>
>Thanks for spotting.  I made it a qemu_strndup instead because that's
>basically what's being implemented here (to be exact it could be a
>memdup() here because the length is already known).  Please test.
>
>Cheers

Works like a charm!

/Henrik Holst
Witsbits AB