mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
curl: Backport fix CVE-2023-32001
(From OE-Core rev: 10df7553d1107438408f680ac28a2daf87d4163e) Signed-off-by: Ashish Sharma <asharma@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
0ffefc4b62
commit
5eab65275d
@@ -0,0 +1,39 @@
|
|||||||
|
From 0c667188e0c6cda615a036b8a2b4125f2c404dde Mon Sep 17 00:00:00 2001
|
||||||
|
From: SaltyMilk <soufiane.elmelcaoui@gmail.com>
|
||||||
|
Date: Mon, 10 Jul 2023 21:43:28 +0200
|
||||||
|
Subject: [PATCH] fopen: optimize
|
||||||
|
|
||||||
|
Closes #11419
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://github.com/curl/curl/commit/0c667188e0c6cda615a036b8a2b4125f2c404dde]
|
||||||
|
CVE: CVE-2023-32001
|
||||||
|
Signed-off-by: Ashish Sharma <asharma@mvista.com>
|
||||||
|
|
||||||
|
|
||||||
|
lib/fopen.c | 12 ++++++------
|
||||||
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/fopen.c b/lib/fopen.c
|
||||||
|
index c9c9e3d6e73a2..b6e3cadddef65 100644
|
||||||
|
--- a/lib/fopen.c
|
||||||
|
+++ b/lib/fopen.c
|
||||||
|
@@ -56,13 +56,13 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename,
|
||||||
|
int fd = -1;
|
||||||
|
*tempname = NULL;
|
||||||
|
|
||||||
|
- if(stat(filename, &sb) == -1 || !S_ISREG(sb.st_mode)) {
|
||||||
|
- /* a non-regular file, fallback to direct fopen() */
|
||||||
|
- *fh = fopen(filename, FOPEN_WRITETEXT);
|
||||||
|
- if(*fh)
|
||||||
|
- return CURLE_OK;
|
||||||
|
+ *fh = fopen(filename, FOPEN_WRITETEXT);
|
||||||
|
+ if(!*fh)
|
||||||
|
goto fail;
|
||||||
|
- }
|
||||||
|
+ if(fstat(fileno(*fh), &sb) == -1 || !S_ISREG(sb.st_mode))
|
||||||
|
+ return CURLE_OK;
|
||||||
|
+ fclose(*fh);
|
||||||
|
+ *fh = NULL;
|
||||||
|
|
||||||
|
result = Curl_rand_hex(data, randsuffix, sizeof(randsuffix));
|
||||||
|
if(result)
|
||||||
@@ -51,6 +51,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \
|
|||||||
file://CVE-2023-28321.patch \
|
file://CVE-2023-28321.patch \
|
||||||
file://CVE-2023-28322-1.patch \
|
file://CVE-2023-28322-1.patch \
|
||||||
file://CVE-2023-28322-2.patch \
|
file://CVE-2023-28322-2.patch \
|
||||||
|
file://CVE-2023-32001.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c"
|
SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user