mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
curl: Fix for CVE-2021-22898
Applied trivial patch for cve issue CVE-2021-22898 Link: https://github.com/curl/curl/commit/39ce47f219b09c380b81f89fe54ac586c8db6bde (From OE-Core rev: ba99fce9354555e556158a0af8ec809ae00cb62b) Signed-off-by: Neetika.Singh <Neetika.Singh@kpit.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
1d36ed3306
commit
02476f72f4
@@ -0,0 +1,26 @@
|
|||||||
|
From 39ce47f219b09c380b81f89fe54ac586c8db6bde Mon Sep 17 00:00:00 2001
|
||||||
|
From: Harry Sintonen <sintonen@iki.fi>
|
||||||
|
Date: Fri, 7 May 2021 13:09:57 +0200
|
||||||
|
Subject: [PATCH] telnet: check sscanf() for correct number of matches
|
||||||
|
|
||||||
|
CVE: CVE-2021-22898
|
||||||
|
Upstream-Status: Backport
|
||||||
|
Link: https://github.com/curl/curl/commit/39ce47f219b09c380b81f89fe54ac586c8db6bde
|
||||||
|
Bug: https://curl.se/docs/CVE-2021-22898.html
|
||||||
|
---
|
||||||
|
lib/telnet.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/telnet.c b/lib/telnet.c
|
||||||
|
index 26e0658ba9cc..fdd137fb0c04 100644
|
||||||
|
--- a/lib/telnet.c
|
||||||
|
+++ b/lib/telnet.c
|
||||||
|
@@ -922,7 +922,7 @@ static void suboption(struct Curl_easy *data)
|
||||||
|
size_t tmplen = (strlen(v->data) + 1);
|
||||||
|
/* Add the variable only if it fits */
|
||||||
|
if(len + tmplen < (int)sizeof(temp)-6) {
|
||||||
|
- if(sscanf(v->data, "%127[^,],%127s", varname, varval)) {
|
||||||
|
+ if(sscanf(v->data, "%127[^,],%127s", varname, varval) == 2) {
|
||||||
|
msnprintf((char *)&temp[len], sizeof(temp) - len,
|
||||||
|
"%c%s%c%s", CURL_NEW_ENV_VAR, varname,
|
||||||
|
CURL_NEW_ENV_VALUE, varval);
|
||||||
@@ -19,6 +19,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
|
|||||||
file://CVE-2020-8286.patch \
|
file://CVE-2020-8286.patch \
|
||||||
file://CVE-2021-22876.patch \
|
file://CVE-2021-22876.patch \
|
||||||
file://CVE-2021-22890.patch \
|
file://CVE-2021-22890.patch \
|
||||||
|
file://CVE-2021-22898.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42"
|
SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42"
|
||||||
|
|||||||
Reference in New Issue
Block a user