Compare commits
2 Commits
79983a2e5c
...
3287878a9d
Author | SHA1 | Date |
---|---|---|
Jindrich Novy | 3287878a9d | |
Jindrich Novy | 3b4891fe10 |
|
@ -0,0 +1 @@
|
||||||
|
29ce2b9695ae93e1b0b349a22cea8067f25a9025 yajl-2.1.0.tar.gz
|
|
@ -0,0 +1,23 @@
|
||||||
|
From 23a122eddaa28165a6c219000adcc31ff9a8a698 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "zhang.jiujiu" <282627424@qq.com>
|
||||||
|
Date: Tue, 7 Dec 2021 22:37:02 +0800
|
||||||
|
Subject: [PATCH] fix memory leaks
|
||||||
|
|
||||||
|
---
|
||||||
|
src/yajl_tree.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/yajl_tree.c b/src/yajl_tree.c
|
||||||
|
index b9e66043..0e7bde98 100644
|
||||||
|
--- a/src/yajl_tree.c
|
||||||
|
+++ b/src/yajl_tree.c
|
||||||
|
@@ -456,6 +456,9 @@ yajl_val yajl_tree_parse (const char *input,
|
||||||
|
yajl_tree_free(v);
|
||||||
|
}
|
||||||
|
yajl_free (handle);
|
||||||
|
+ //If the requested memory is not released in time, it will cause memory leakage
|
||||||
|
+ if(ctx.root)
|
||||||
|
+ yajl_tree_free(ctx.root);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
From 3d65cb0c6db4d433e5e42ee7d91d8a04e21337cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: wujing <wujing50@huawei.com>
|
||||||
|
Date: Thu, 14 Feb 2019 03:12:30 +0800
|
||||||
|
Subject: [PATCH] yajl: fix memory leak problem
|
||||||
|
|
||||||
|
reason: fix memory leak problem
|
||||||
|
---
|
||||||
|
src/yajl_tree.c | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/yajl_tree.c b/src/yajl_tree.c
|
||||||
|
index 3d357a32..4b3cf2b1 100644
|
||||||
|
--- a/src/yajl_tree.c
|
||||||
|
+++ b/src/yajl_tree.c
|
||||||
|
@@ -143,7 +143,7 @@ static yajl_val context_pop(context_t *ctx)
|
||||||
|
ctx->stack = stack->next;
|
||||||
|
|
||||||
|
v = stack->value;
|
||||||
|
-
|
||||||
|
+ free (stack->key);
|
||||||
|
free (stack);
|
||||||
|
|
||||||
|
return (v);
|
||||||
|
@@ -444,6 +444,10 @@ yajl_val yajl_tree_parse (const char *input,
|
||||||
|
snprintf(error_buffer, error_buffer_size, "%s", internal_err_str);
|
||||||
|
YA_FREE(&(handle->alloc), internal_err_str);
|
||||||
|
}
|
||||||
|
+ while(ctx.stack != NULL) {
|
||||||
|
+ yajl_val v = context_pop(&ctx);
|
||||||
|
+ yajl_tree_free(v);
|
||||||
|
+ }
|
||||||
|
yajl_free (handle);
|
||||||
|
return NULL;
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
From d3a528c788ba9e531fab91db41d3a833c54da325 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jacek Tomasiak <jacek.tomasiak@gmail.com>
|
||||||
|
Date: Thu, 12 May 2022 13:02:47 +0200
|
||||||
|
Subject: [PATCH] Fix CVE-2022-24795 (from brianmario/yajl-ruby)
|
||||||
|
|
||||||
|
The buffer reallocation could cause heap corruption because of `need`
|
||||||
|
overflow for large inputs. In addition, there's a possible infinite loop
|
||||||
|
in case `need` reaches zero.
|
||||||
|
|
||||||
|
The fix is to `abort()` if the loop ends with lower value of `need` than
|
||||||
|
when it started.
|
||||||
|
---
|
||||||
|
src/yajl_buf.c | 10 +++++++++-
|
||||||
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: yajl-2.1.0/src/yajl_buf.c
|
||||||
|
===================================================================
|
||||||
|
diff -up yajl-2.1.0/src/yajl_buf.c.CVE-2022-24795 yajl-2.1.0/src/yajl_buf.c
|
||||||
|
--- yajl-2.1.0/src/yajl_buf.c.CVE-2022-24795 2024-01-05 14:37:48.291676702 +0100
|
||||||
|
+++ yajl-2.1.0/src/yajl_buf.c 2024-01-05 14:38:48.088674110 +0100
|
||||||
|
@@ -45,7 +45,16 @@ int yajl_buf_ensure_available(yajl_buf b
|
||||||
|
|
||||||
|
need = buf->len;
|
||||||
|
|
||||||
|
- while (want >= (need - buf->used)) need <<= 1;
|
||||||
|
+ while (need > 0 && want >= (need - buf->used)) {
|
||||||
|
+ /* this eventually "overflows" to zero */
|
||||||
|
+ need <<= 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* overflow */
|
||||||
|
+ if (need < buf->len) {
|
||||||
|
+ abort();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (need < buf->used) {
|
||||||
|
return -1;
|
||||||
|
}
|
16
yajl.spec
16
yajl.spec
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
Name: yajl
|
Name: yajl
|
||||||
Version: 2.1.0
|
Version: 2.1.0
|
||||||
Release: 21%{?dist}
|
Release: 23%{?dist}
|
||||||
Summary: Yet Another JSON Library (YAJL)
|
Summary: Yet Another JSON Library (YAJL)
|
||||||
|
|
||||||
License: ISC
|
License: ISC
|
||||||
|
@ -24,6 +24,9 @@ Patch2: %{name}-%{version}-pkgconfig-includedir.patch
|
||||||
Patch3: %{name}-%{version}-test-location.patch
|
Patch3: %{name}-%{version}-test-location.patch
|
||||||
Patch4: %{name}-%{version}-dynlink-binaries.patch
|
Patch4: %{name}-%{version}-dynlink-binaries.patch
|
||||||
Patch5: https://github.com/containers/yajl/commit/49923ccb2143e36850bcdeb781e2bcdf5ce22f15.patch
|
Patch5: https://github.com/containers/yajl/commit/49923ccb2143e36850bcdeb781e2bcdf5ce22f15.patch
|
||||||
|
Patch6: https://github.com/openEuler-BaseService/yajl/commit/3d65cb0c6db4d433e5e42ee7d91d8a04e21337cf.patch
|
||||||
|
Patch7: https://github.com/openEuler-BaseService/yajl/commit/23a122eddaa28165a6c219000adcc31ff9a8a698.patch
|
||||||
|
Patch8: yajl-2.1.0-CVE-2022-24795.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
|
@ -52,6 +55,9 @@ necessary for developing against the YAJL library
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# NB, we are not using upstream's 'configure'/'make'
|
# NB, we are not using upstream's 'configure'/'make'
|
||||||
|
@ -96,6 +102,14 @@ cd test
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 05 2024 Jindrich Novy <jnovy@redhat.com> - 2.1.0-23
|
||||||
|
- fix CVE-2022-24795
|
||||||
|
- Related: Jira:RHEL-2112
|
||||||
|
|
||||||
|
* Wed Jul 12 2023 Jindrich Novy <jnovy@redhat.com> - 2.1.0-22
|
||||||
|
- fix CVE-2023-33460
|
||||||
|
- Resolves: #2221253
|
||||||
|
|
||||||
* Tue Apr 26 2022 Jindrich Novy <jnovy@redhat.com> - 2.1.0-21
|
* Tue Apr 26 2022 Jindrich Novy <jnovy@redhat.com> - 2.1.0-21
|
||||||
- fix CVE-2022-24795
|
- fix CVE-2022-24795
|
||||||
- Related: #2061316
|
- Related: #2061316
|
||||||
|
|
Loading…
Reference in New Issue