Version in base suite: 7.74.0-1.3+deb11u9 Base version: curl_7.74.0-1.3+deb11u9 Target version: curl_7.74.0-1.3+deb11u10 Base file: /srv/ftp-master.debian.org/ftp/pool/main/c/curl/curl_7.74.0-1.3+deb11u9.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/c/curl/curl_7.74.0-1.3+deb11u10.dsc changelog | 10 +++ patches/CVE-2023-38545.patch | 128 +++++++++++++++++++++++++++++++++++++++++++ patches/CVE-2023-38546.patch | 118 +++++++++++++++++++++++++++++++++++++++ patches/series | 4 + rules | 11 ++- 5 files changed, 268 insertions(+), 3 deletions(-) diff -Nru curl-7.74.0/debian/changelog curl-7.74.0/debian/changelog --- curl-7.74.0/debian/changelog 2023-09-10 09:49:20.000000000 +0000 +++ curl-7.74.0/debian/changelog 2023-10-05 21:51:40.000000000 +0000 @@ -1,3 +1,13 @@ +curl (7.74.0-1.3+deb11u10) bullseye-security; urgency=high + + * Add patches to fix CVE-2023-38545 and CVE-2023-38546 + * d/rules: + - dh_auto_test: + ~ Only run non-flaky tests and enable verbose mode + ~ Respect nocheck build profile + + -- Samuel Henrique Thu, 05 Oct 2023 22:51:40 +0100 + curl (7.74.0-1.3+deb11u9) bullseye; urgency=medium * Team upload. diff -Nru curl-7.74.0/debian/patches/CVE-2023-38545.patch curl-7.74.0/debian/patches/CVE-2023-38545.patch --- curl-7.74.0/debian/patches/CVE-2023-38545.patch 1970-01-01 00:00:00.000000000 +0000 +++ curl-7.74.0/debian/patches/CVE-2023-38545.patch 2023-10-05 21:51:40.000000000 +0000 @@ -0,0 +1,128 @@ +From 1d66562c67fc0099d0fd882c693e51dd0b10c45c Mon Sep 17 00:00:00 2001 +From: Jay Satiro +Date: Sat, 30 Sep 2023 03:40:02 -0400 +Subject: [PATCH] socks: return error if hostname too long for remote resolve + +Prior to this change the state machine attempted to change the remote +resolve to a local resolve if the hostname was longer than 255 +characters. Unfortunately that did not work as intended and caused a +security issue. + +Name resolvers cannot resolve hostnames longer than 255 characters. + +Bug: https://curl.se/docs/CVE-2023-38545.html + +Backported by: Samuel Henrique + +--- + lib/socks.c | 13 +++++---- + tests/data/Makefile.inc | 2 +- + tests/data/test728 | 64 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 73 insertions(+), 6 deletions(-) + create mode 100644 tests/data/test728 + +--- a/lib/socks.c ++++ b/lib/socks.c +@@ -531,11 +531,11 @@ CURLproxycode Curl_SOCKS5(const char *pr + infof(conn->data, "SOCKS5: connecting to HTTP proxy %s port %d\n", + hostname, remote_port); + +- /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ ++ /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet. */ + if(!socks5_resolve_local && hostname_len > 255) { +- infof(conn->data, "SOCKS5: server resolving disabled for hostnames of " +- "length > 255 [actual len=%zu]\n", hostname_len); +- socks5_resolve_local = TRUE; ++ failf(data, "SOCKS5: the destination hostname is too long to be " ++ "resolved remotely by the proxy."); ++ return CURLPX_LONG_HOSTNAME; + } + + if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) +@@ -855,7 +855,7 @@ CURLproxycode Curl_SOCKS5(const char *pr + + if(!socks5_resolve_local) { + socksreq[len++] = 3; /* ATYP: domain name = 3 */ +- socksreq[len++] = (char) hostname_len; /* one byte address length */ ++ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ + memcpy(&socksreq[len], hostname, hostname_len); /* address w/o NULL */ + len += hostname_len; + infof(data, "SOCKS5 connect to %s:%d (remotely resolved)\n", +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -92,7 +92,7 @@ test662 test663 test664 test665 test666 + test670 test671 test672 test673 test674 \ + \ + test700 test701 test702 test703 test704 test705 test706 test707 test708 \ +-test709 test710 test711 test712 test713 test714 test715 test716 test717 \ ++test709 test710 test711 test712 test713 test714 test715 test716 test717 test728 \ + \ + test800 test801 test802 test803 test804 test805 test806 test807 test808 \ + test809 test810 test811 test812 test813 test814 test815 test816 test817 \ +--- /dev/null ++++ b/tests/data/test728 +@@ -0,0 +1,64 @@ ++ ++ ++ ++HTTP ++HTTP GET ++SOCKS5 ++SOCKS5h ++followlocation ++ ++ ++ ++# ++# Server-side ++ ++# The hostname in this redirect is 256 characters and too long (> 255) for ++# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. ++ ++HTTP/1.1 301 Moved Permanently ++Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ ++Content-Length: 0 ++Connection: close ++ ++ ++ ++ ++# ++# Client-side ++ ++ ++proxy ++ ++ ++http ++socks5 ++ ++ ++SOCKS5h with HTTP redirect to hostname too long ++ ++ ++--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++97 ++ ++# the error message is verified because error code CURLE_PROXY (97) may be ++# returned for any number of reasons and we need to make sure it is ++# specifically for the reason below so that we know the check is working. ++ ++curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. ++ ++ ++ diff -Nru curl-7.74.0/debian/patches/CVE-2023-38546.patch curl-7.74.0/debian/patches/CVE-2023-38546.patch --- curl-7.74.0/debian/patches/CVE-2023-38546.patch 1970-01-01 00:00:00.000000000 +0000 +++ curl-7.74.0/debian/patches/CVE-2023-38546.patch 2023-10-05 21:51:40.000000000 +0000 @@ -0,0 +1,118 @@ +From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 14 Sep 2023 23:28:32 +0200 +Subject: [PATCH] cookie: remove unnecessary struct fields + +Plus: reduce the hash table size from 256 to 63. It seems unlikely to +make much of a speed difference for most use cases but saves 1.5KB of +data per instance. + +Closes #11862 + +Backported by: Samuel Henrique + +--- + lib/cookie.c | 13 +------------ + lib/cookie.h | 13 ++++--------- + lib/easy.c | 4 +--- + 3 files changed, 6 insertions(+), 24 deletions(-) + +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -114,7 +114,6 @@ static void freecookie(struct Cookie *co + free(co->name); + free(co->value); + free(co->maxage); +- free(co->version); + free(co); + } + +@@ -674,11 +673,7 @@ Curl_cookie_add(struct Curl_easy *data, + } + } + else if(strcasecompare("version", name)) { +- strstore(&co->version, whatptr); +- if(!co->version) { +- badcookie = TRUE; +- break; +- } ++ /* just ignore */ + } + else if(strcasecompare("max-age", name)) { + /* Defined in RFC2109: +@@ -1075,7 +1070,6 @@ Curl_cookie_add(struct Curl_easy *data, + free(clist->path); + free(clist->spath); + free(clist->expirestr); +- free(clist->version); + free(clist->maxage); + + *clist = *co; /* then store all the new data */ +@@ -1144,9 +1138,6 @@ struct CookieInfo *Curl_cookie_init(stru + c = calloc(1, sizeof(struct CookieInfo)); + if(!c) + return NULL; /* failed to get memory */ +- c->filename = strdup(file?file:"none"); /* copy the name just in case */ +- if(!c->filename) +- goto fail; /* failed to get memory */ + } + else { + /* we got an already existing one, use that */ +@@ -1274,7 +1265,6 @@ static struct Cookie *dup_cookie(struct + CLONE(name); + CLONE(value); + CLONE(maxage); +- CLONE(version); + d->expires = src->expires; + d->tailmatch = src->tailmatch; + d->secure = src->secure; +@@ -1496,7 +1486,6 @@ void Curl_cookie_cleanup(struct CookieIn + { + if(c) { + unsigned int i; +- free(c->filename); + for(i = 0; i < COOKIE_HASH_SIZE; i++) + Curl_cookie_freelist(c->cookies[i]); + free(c); /* free the base struct as well */ +--- a/lib/cookie.h ++++ b/lib/cookie.h +@@ -36,8 +36,6 @@ struct Cookie { + char *expirestr; /* the plain text version */ + bool tailmatch; /* whether we do tail-matching of the domain name */ + +- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ +- char *version; /* Version = */ + char *maxage; /* Max-Age = */ + + bool secure; /* whether the 'secure' keyword was used */ +@@ -54,15 +52,14 @@ struct Cookie { + #define COOKIE_PREFIX__SECURE (1<<0) + #define COOKIE_PREFIX__HOST (1<<1) + +-#define COOKIE_HASH_SIZE 256 ++#define COOKIE_HASH_SIZE 63 + + struct CookieInfo { + /* linked list of cookies we know of */ + struct Cookie *cookies[COOKIE_HASH_SIZE]; + +- char *filename; /* file we read from/write to */ + bool running; /* state info, for cookie adding information */ +- long numcookies; /* number of cookies in the "jar" */ ++ int numcookies; /* number of cookies in the "jar" */ + bool newsession; /* new session, discard session cookies on load */ + int lastct; /* last creation-time used in the jar */ + }; +--- a/lib/easy.c ++++ b/lib/easy.c +@@ -836,9 +836,7 @@ struct Curl_easy *curl_easy_duphandle(st + if(data->cookies) { + /* If cookies are enabled in the parent handle, we enable them + in the clone as well! */ +- outcurl->cookies = Curl_cookie_init(data, +- data->cookies->filename, +- outcurl->cookies, ++ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, + data->set.cookiesession); + if(!outcurl->cookies) + goto fail; diff -Nru curl-7.74.0/debian/patches/series curl-7.74.0/debian/patches/series --- curl-7.74.0/debian/patches/series 2023-09-10 09:49:20.000000000 +0000 +++ curl-7.74.0/debian/patches/series 2023-10-05 21:51:40.000000000 +0000 @@ -41,6 +41,10 @@ CVE-2023-28321.patch CVE-2023-28322.patch +# Patches from 8.4.0. +CVE-2023-38545.patch +CVE-2023-38546.patch + # Always add CVE patches before these two patches 90_gnutls.patch 99_nss.patch diff -Nru curl-7.74.0/debian/rules curl-7.74.0/debian/rules --- curl-7.74.0/debian/rules 2023-09-10 09:49:20.000000000 +0000 +++ curl-7.74.0/debian/rules 2023-10-05 21:51:40.000000000 +0000 @@ -65,9 +65,14 @@ cd debian/build-nss && dh_auto_build override_dh_auto_test: - -cd debian/build && dh_auto_test - -cd debian/build-gnutls && dh_auto_test - -cd debian/build-nss && dh_auto_test +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + -cd debian/build && VERBOSE=1 \ + $(MAKE) test-nonflaky + -cd debian/build-gnutls && VERBOSE=1 \ + $(MAKE) test-nonflaky + -cd debian/build-nss && VERBOSE=1 \ + $(MAKE) test-nonflaky +endif override_dh_install: ${MAKE} -C debian/build \