Attachment 872248 Details for Bug 1219273

[patch] CVE-2023-27534.patch

CVE-2023-27534.patch (text/plain), 1.77 KB, created by Marcus Meissner on 2024-01-29 09:59:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2024-01-29 09:59:38 UTC

Size: 1.77 KB

patch

obsolete

>From: Daniel Stenberg <daniel@haxx.se>
>Date: Thu, 9 Mar 2023 16:22:11 +0100
>Subject: CVE-2023-27534
>
>Closes #10729
>
>Backported to Debian by Samuel Henrique <samueloph@debian.org>
>
>origin: https://github.com/curl/curl/commit/4e2b52b5f7a3bf50a0f1494155717b02cc1df6d6
>origin-fix: https://github.com/curl/curl/commit/91b53efa4b6854dc3688f55bfb329b0cafcf5325
>---
> lib/curl_path.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/lib/curl_path.c b/lib/curl_path.c
>index 68f3e44..8085575 100644
>--- a/lib/curl_path.c
>+++ b/lib/curl_path.c
>@@ -58,7 +58,8 @@ CURLcode Curl_getworkingpath(struct connectdata *conn,
>       memcpy(real_path, working_path, 1 + working_path_len);
>   }
>   else if(conn->handler->protocol & CURLPROTO_SFTP) {
>-    if((working_path_len > 1) && (working_path[1] == '~')) {
>+    if((!strcmp("/~", working_path) ||
>+	(working_path_len > 2) && !memcmp(working_path, "/~/", 3))) {
>       size_t homelen = strlen(homedir);
>       real_path = malloc(homelen + working_path_len + 1);
>       if(real_path == NULL) {
>@@ -68,11 +69,14 @@ CURLcode Curl_getworkingpath(struct connectdata *conn,
>       /* It is referenced to the home directory, so strip the
>          leading '/' */
>       memcpy(real_path, homedir, homelen);
>-      real_path[homelen] = '/';
>-      real_path[homelen + 1] = '\0';
>-      if(working_path_len > 3) {
>-        memcpy(real_path + homelen + 1, working_path + 3,
>-               1 + working_path_len -3);
>+      real_path[homelen] = '\0';
>+      if(working_path_len > 2) {
>+	int copyfrom = 3;
>+	/* Copy a separating '/' if homedir does not end with one */
>+	if(homelen && (homedir[homelen-1] != '/'))
>+	  copyfrom = 2;
>+	memcpy(real_path+homelen, working_path + copyfrom,
>+	       1 + working_path_len - copyfrom);
>       }
>     }
>     else {

Actions: View | Diff

Attachments on bug 1219273: 872248