CentOS Sources
2 years ago
committed by
MSVSphere Packaging Team
parent
05d4fda5db
commit
f3804b8f8b
@ -0,0 +1,136 @@
|
|||||||
|
From fbc2ac6f06ec13cc872ce7adb870f4d7c7d5dded Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Stenberg <daniel@haxx.se>
|
||||||
|
Date: Mon, 29 Aug 2022 00:09:17 +0200
|
||||||
|
Subject: [PATCH 1/2] cookie: reject cookies with "control bytes"
|
||||||
|
|
||||||
|
Rejects 0x01 - 0x1f (except 0x09) plus 0x7f
|
||||||
|
|
||||||
|
Reported-by: Axel Chong
|
||||||
|
|
||||||
|
Bug: https://curl.se/docs/CVE-2022-35252.html
|
||||||
|
|
||||||
|
CVE-2022-35252
|
||||||
|
|
||||||
|
Closes #9381
|
||||||
|
|
||||||
|
Upstream-commit: 8dfc93e573ca740544a2d79ebb0ed786592c65c3
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
lib/cookie.c | 29 +++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 29 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/cookie.c b/lib/cookie.c
|
||||||
|
index cb0c03b..e0470a1 100644
|
||||||
|
--- a/lib/cookie.c
|
||||||
|
+++ b/lib/cookie.c
|
||||||
|
@@ -383,6 +383,30 @@ static void strstore(char **str, const char *newstr)
|
||||||
|
*str = strdup(newstr);
|
||||||
|
}
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ RFC 6265 section 4.1.1 says a server should accept this range:
|
||||||
|
+
|
||||||
|
+ cookie-octet = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E
|
||||||
|
+
|
||||||
|
+ But Firefox and Chrome as of June 2022 accept space, comma and double-quotes
|
||||||
|
+ fine. The prime reason for filtering out control bytes is that some HTTP
|
||||||
|
+ servers return 400 for requests that contain such.
|
||||||
|
+*/
|
||||||
|
+static int invalid_octets(const char *p)
|
||||||
|
+{
|
||||||
|
+ /* Reject all bytes \x01 - \x1f (*except* \x09, TAB) + \x7f */
|
||||||
|
+ static const char badoctets[] = {
|
||||||
|
+ "\x01\x02\x03\x04\x05\x06\x07\x08\x0a"
|
||||||
|
+ "\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14"
|
||||||
|
+ "\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f"
|
||||||
|
+ };
|
||||||
|
+ size_t vlen, len;
|
||||||
|
+ /* scan for all the octets that are *not* in cookie-octet */
|
||||||
|
+ len = strcspn(p, badoctets);
|
||||||
|
+ vlen = strlen(p);
|
||||||
|
+ return (len != vlen);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* remove_expired() removes expired cookies.
|
||||||
|
*/
|
||||||
|
@@ -567,6 +591,11 @@ Curl_cookie_add(struct Curl_easy *data,
|
||||||
|
badcookie = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
+ if(invalid_octets(whatptr) || invalid_octets(name)) {
|
||||||
|
+ infof(data, "invalid octets in name/value, cookie dropped");
|
||||||
|
+ badcookie = TRUE;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
else if(!len) {
|
||||||
|
/* this was a "<name>=" with no content, and we must allow
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
|
|
||||||
|
|
||||||
|
From 1a3e2bd48572761236934651091c899a4d460ef5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Stenberg <daniel@haxx.se>
|
||||||
|
Date: Mon, 29 Aug 2022 00:09:17 +0200
|
||||||
|
Subject: [PATCH 2/2] test8: verify that "ctrl-byte cookies" are ignored
|
||||||
|
|
||||||
|
Upstream-commit: 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
tests/data/test8 | 32 +++++++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 31 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/data/test8 b/tests/data/test8
|
||||||
|
index a8548e6..8587611 100644
|
||||||
|
--- a/tests/data/test8
|
||||||
|
+++ b/tests/data/test8
|
||||||
|
@@ -46,6 +46,36 @@ Set-Cookie: trailingspace = removed; path=/we/want;
|
||||||
|
Set-Cookie: nocookie=yes; path=/WE;
|
||||||
|
Set-Cookie: blexp=yesyes; domain=%HOSTIP; domain=%HOSTIP; expiry=totally bad;
|
||||||
|
Set-Cookie: partialip=nono; domain=.0.0.1;
|
||||||
|
+Set-Cookie: cookie1=%hex[%01-junk]hex%
|
||||||
|
+Set-Cookie: cookie2=%hex[%02-junk]hex%
|
||||||
|
+Set-Cookie: cookie3=%hex[%03-junk]hex%
|
||||||
|
+Set-Cookie: cookie4=%hex[%04-junk]hex%
|
||||||
|
+Set-Cookie: cookie5=%hex[%05-junk]hex%
|
||||||
|
+Set-Cookie: cookie6=%hex[%06-junk]hex%
|
||||||
|
+Set-Cookie: cookie7=%hex[%07-junk]hex%
|
||||||
|
+Set-Cookie: cookie8=%hex[%08-junk]hex%
|
||||||
|
+Set-Cookie: cookie9=%hex[junk-%09-]hex%
|
||||||
|
+Set-Cookie: cookie11=%hex[%0b-junk]hex%
|
||||||
|
+Set-Cookie: cookie12=%hex[%0c-junk]hex%
|
||||||
|
+Set-Cookie: cookie14=%hex[%0e-junk]hex%
|
||||||
|
+Set-Cookie: cookie15=%hex[%0f-junk]hex%
|
||||||
|
+Set-Cookie: cookie16=%hex[%10-junk]hex%
|
||||||
|
+Set-Cookie: cookie17=%hex[%11-junk]hex%
|
||||||
|
+Set-Cookie: cookie18=%hex[%12-junk]hex%
|
||||||
|
+Set-Cookie: cookie19=%hex[%13-junk]hex%
|
||||||
|
+Set-Cookie: cookie20=%hex[%14-junk]hex%
|
||||||
|
+Set-Cookie: cookie21=%hex[%15-junk]hex%
|
||||||
|
+Set-Cookie: cookie22=%hex[%16-junk]hex%
|
||||||
|
+Set-Cookie: cookie23=%hex[%17-junk]hex%
|
||||||
|
+Set-Cookie: cookie24=%hex[%18-junk]hex%
|
||||||
|
+Set-Cookie: cookie25=%hex[%19-junk]hex%
|
||||||
|
+Set-Cookie: cookie26=%hex[%1a-junk]hex%
|
||||||
|
+Set-Cookie: cookie27=%hex[%1b-junk]hex%
|
||||||
|
+Set-Cookie: cookie28=%hex[%1c-junk]hex%
|
||||||
|
+Set-Cookie: cookie29=%hex[%1d-junk]hex%
|
||||||
|
+Set-Cookie: cookie30=%hex[%1e-junk]hex%
|
||||||
|
+Set-Cookie: cookie31=%hex[%1f-junk]hex%
|
||||||
|
+Set-Cookie: cookie31=%hex[%7f-junk]hex%
|
||||||
|
|
||||||
|
</file>
|
||||||
|
<precheck>
|
||||||
|
@@ -60,7 +90,7 @@ GET /we/want/%TESTNUMBER HTTP/1.1
|
||||||
|
Host: %HOSTIP:%HTTPPORT
|
||||||
|
User-Agent: curl/%VERSION
|
||||||
|
Accept: */*
|
||||||
|
-Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes
|
||||||
|
+Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes; cookie9=junk- -
|
||||||
|
|
||||||
|
</protocol>
|
||||||
|
</verify>
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
|
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
From 5cdcf1dbd39c64e18a81fc912a36942a3ec87565 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Stenberg <daniel@haxx.se>
|
||||||
|
Date: Mon, 19 Dec 2022 08:38:37 +0100
|
||||||
|
Subject: [PATCH] smb/telnet: do not free the protocol struct in *_done()
|
||||||
|
|
||||||
|
It is managed by the generic layer.
|
||||||
|
|
||||||
|
Reported-by: Trail of Bits
|
||||||
|
|
||||||
|
Closes #10112
|
||||||
|
|
||||||
|
Upstream-commit: 4f20188ac644afe174be6005ef4f6ffba232b8b2
|
||||||
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
---
|
||||||
|
lib/smb.c | 14 ++------------
|
||||||
|
lib/telnet.c | 3 ---
|
||||||
|
2 files changed, 2 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/smb.c b/lib/smb.c
|
||||||
|
index 039d680..f682c1f 100644
|
||||||
|
--- a/lib/smb.c
|
||||||
|
+++ b/lib/smb.c
|
||||||
|
@@ -60,8 +60,6 @@ static CURLcode smb_connect(struct Curl_easy *data, bool *done);
|
||||||
|
static CURLcode smb_connection_state(struct Curl_easy *data, bool *done);
|
||||||
|
static CURLcode smb_do(struct Curl_easy *data, bool *done);
|
||||||
|
static CURLcode smb_request_state(struct Curl_easy *data, bool *done);
|
||||||
|
-static CURLcode smb_done(struct Curl_easy *data, CURLcode status,
|
||||||
|
- bool premature);
|
||||||
|
static CURLcode smb_disconnect(struct Curl_easy *data,
|
||||||
|
struct connectdata *conn, bool dead);
|
||||||
|
static int smb_getsock(struct Curl_easy *data, struct connectdata *conn,
|
||||||
|
@@ -76,7 +74,7 @@ const struct Curl_handler Curl_handler_smb = {
|
||||||
|
"SMB", /* scheme */
|
||||||
|
smb_setup_connection, /* setup_connection */
|
||||||
|
smb_do, /* do_it */
|
||||||
|
- smb_done, /* done */
|
||||||
|
+ ZERO_NULL, /* done */
|
||||||
|
ZERO_NULL, /* do_more */
|
||||||
|
smb_connect, /* connect_it */
|
||||||
|
smb_connection_state, /* connecting */
|
||||||
|
@@ -103,7 +101,7 @@ const struct Curl_handler Curl_handler_smbs = {
|
||||||
|
"SMBS", /* scheme */
|
||||||
|
smb_setup_connection, /* setup_connection */
|
||||||
|
smb_do, /* do_it */
|
||||||
|
- smb_done, /* done */
|
||||||
|
+ ZERO_NULL, /* done */
|
||||||
|
ZERO_NULL, /* do_more */
|
||||||
|
smb_connect, /* connect_it */
|
||||||
|
smb_connection_state, /* connecting */
|
||||||
|
@@ -941,14 +939,6 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done)
|
||||||
|
return CURLE_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static CURLcode smb_done(struct Curl_easy *data, CURLcode status,
|
||||||
|
- bool premature)
|
||||||
|
-{
|
||||||
|
- (void) premature;
|
||||||
|
- Curl_safefree(data->req.p.smb);
|
||||||
|
- return status;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
static CURLcode smb_disconnect(struct Curl_easy *data,
|
||||||
|
struct connectdata *conn, bool dead)
|
||||||
|
{
|
||||||
|
diff --git a/lib/telnet.c b/lib/telnet.c
|
||||||
|
index 923c7f8..48cd0d7 100644
|
||||||
|
--- a/lib/telnet.c
|
||||||
|
+++ b/lib/telnet.c
|
||||||
|
@@ -1248,9 +1248,6 @@ static CURLcode telnet_done(struct Curl_easy *data,
|
||||||
|
|
||||||
|
curl_slist_free_all(tn->telnet_vars);
|
||||||
|
tn->telnet_vars = NULL;
|
||||||
|
-
|
||||||
|
- Curl_safefree(data->req.p.telnet);
|
||||||
|
-
|
||||||
|
return CURLE_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
||||||
Loading…
Reference in new issue