import aspell-0.60.6.1-22.el8

This commit is contained in:
CentOS Sources 2022-03-29 10:04:40 -04:00 committed by Stepan Oksanichenko
parent 3954391764
commit 44b0825ba3
2 changed files with 104 additions and 1 deletions

View File

@ -0,0 +1,96 @@
From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <kevina@gnu.org>
Date: Sat, 21 Dec 2019 20:32:47 +0000
Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
to prevent a buffer overflow
Bug found using OSS-Fuze.
---
common/objstack.hpp | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/common/objstack.hpp b/common/objstack.hpp
index 3997bf7..bd97ccd 100644
--- a/common/objstack.hpp
+++ b/common/objstack.hpp
@@ -5,6 +5,7 @@
#include "parm_string.hpp"
#include <stdlib.h>
#include <assert.h>
+#include <stddef.h>
namespace acommon {
@@ -26,6 +27,12 @@ class ObjStack
byte * temp_end;
void setup_chunk();
void new_chunk();
+ bool will_overflow(size_t sz) const {
+ return offsetof(Node,data) + sz > chunk_size;
+ }
+ void check_size(size_t sz) {
+ assert(!will_overflow(sz));
+ }
ObjStack(const ObjStack &);
void operator=(const ObjStack &);
@@ -56,7 +63,7 @@ class ObjStack
void * alloc_bottom(size_t size) {
byte * tmp = bottom;
bottom += size;
- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
+ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
return tmp;
}
// This alloc_bottom will insure that the object is aligned based on the
@@ -66,7 +73,7 @@ class ObjStack
align_bottom(align);
byte * tmp = bottom;
bottom += size;
- if (bottom > top) {new_chunk(); goto loop;}
+ if (bottom > top) {check_size(size); new_chunk(); goto loop;}
return tmp;
}
char * dup_bottom(ParmString str) {
@@ -79,7 +86,7 @@ class ObjStack
// always be aligned as such.
void * alloc_top(size_t size) {
top -= size;
- if (top < bottom) {new_chunk(); top -= size;}
+ if (top < bottom) {check_size(size); new_chunk(); top -= size;}
return top;
}
// This alloc_top will insure that the object is aligned based on
@@ -88,7 +95,7 @@ class ObjStack
{loop:
top -= size;
align_top(align);
- if (top < bottom) {new_chunk(); goto loop;}
+ if (top < bottom) {check_size(size); new_chunk(); goto loop;}
return top;
}
char * dup_top(ParmString str) {
@@ -117,6 +124,7 @@ class ObjStack
void * alloc_temp(size_t size) {
temp_end = bottom + size;
if (temp_end > top) {
+ check_size(size);
new_chunk();
temp_end = bottom + size;
}
@@ -131,6 +139,7 @@ class ObjStack
} else {
size_t s = temp_end - bottom;
byte * p = bottom;
+ check_size(size);
new_chunk();
memcpy(bottom, p, s);
temp_end = bottom + size;
@@ -150,6 +159,7 @@ class ObjStack
} else {
size_t s = temp_end - bottom;
byte * p = bottom;
+ check_size(size);
new_chunk();
memcpy(bottom, p, s);
temp_end = bottom + size;

View File

@ -1,7 +1,7 @@
Summary: Spell checker Summary: Spell checker
Name: aspell Name: aspell
Version: 0.60.6.1 Version: 0.60.6.1
Release: 21%{?dist} Release: 22%{?dist}
Epoch: 12 Epoch: 12
# LGPLv2+ .. common/gettext.h # LGPLv2+ .. common/gettext.h
# LGPLv2 .. modules/speller/default/phonet.hpp, # LGPLv2 .. modules/speller/default/phonet.hpp,
@ -28,6 +28,8 @@ Patch6: aspell-0.60.6.1-aarch64.patch
Patch7: aspell-0.60.6.1-gcc7-fixes.patch Patch7: aspell-0.60.6.1-gcc7-fixes.patch
# resolves: #1562364 # resolves: #1562364
Patch8: aspell-0.60.6.1-fix-back-on-empty-vector.patch Patch8: aspell-0.60.6.1-fix-back-on-empty-vector.patch
# resolves: #1988497
Patch9: aspell-0.60.6.1-CVE-2019-25051.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter
@ -67,6 +69,7 @@ and header files needed for Aspell development.
%patch6 -p1 -b .aarch64 %patch6 -p1 -b .aarch64
%patch7 -p1 -b .gcc7-fixes %patch7 -p1 -b .gcc7-fixes
%patch8 -p1 -b .back-empty-vector %patch8 -p1 -b .back-empty-vector
%patch9 -p1 -b .CVE-2019-25051
iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux
mv manual/aspell.info.aux manual/aspell.info mv manual/aspell.info.aux manual/aspell.info
@ -159,6 +162,10 @@ fi
%{_mandir}/man1/pspell-config.1* %{_mandir}/man1/pspell-config.1*
%changelog %changelog
* Mon Oct 11 2021 Nikola Forró <nforro@redhat.com> - 12:0.60.6.1-22
- resolves: #1988497
fix CVE-2019-25051
* Wed Apr 04 2018 Nikola Forró <nforro@redhat.com> - 12:0.60.6.1-21 * Wed Apr 04 2018 Nikola Forró <nforro@redhat.com> - 12:0.60.6.1-21
- resolves: #1562364 - resolves: #1562364
do not call back() on an empty vector do not call back() on an empty vector