From 40c6adf0ac76b5a7cac60173c75fd98cb0b0f890 Mon Sep 17 00:00:00 2001 From: wangkerong Date: Tue, 13 Dec 2022 08:49:51 +0000 Subject: [PATCH 1/2] fix segment fault when use augtool command (cherry picked from commit cf84eeb5ec5e0ea5ecb026cd65939739a75b7271) --- augeas.spec | 6 +++++- fix-segment-fault-when-use-augtool.patch | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 fix-segment-fault-when-use-augtool.patch diff --git a/augeas.spec b/augeas.spec index 3e48ec6..3306f69 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 1.13.0 -Release: 4 +Release: 5 Summary: Augeas is a configuration editing tool for changing configuration files License: LGPLv2+ URL: https://augeas.net/ @@ -17,6 +17,7 @@ Patch6000: backport-revert-add-else-operator-to-augeas-path-filter-expressio %if "0%{?product_family}" != "0" Patch9000: decrease-HASHCOUNT_T_MAX-to-avoid-the-OOM-during-the-Fuzz-test.patch %endif +Patch9001: fix-segment-fault-when-use-augtool.patch %description Augeas is a configuration editing tool. It parses configuration files in their native @@ -103,6 +104,9 @@ make check %doc %{_mandir}/man1/au*.1.gz %changelog +* Tue Dec 13 2022 wangkerong - 1.13.0-5 +- fix segment fault when use augtool command + * Thu Jun 16 2022 wangkerong - 1.13.0-4 - revert this patch,resolv use-after-free issue when fuzz test diff --git a/fix-segment-fault-when-use-augtool.patch b/fix-segment-fault-when-use-augtool.patch new file mode 100644 index 0000000..adcf854 --- /dev/null +++ b/fix-segment-fault-when-use-augtool.patch @@ -0,0 +1,24 @@ +From f13e8f91110e1fa3dbd1e053c8f6ffee9e6cdd5d Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 10 May 2022 14:35:21 +0800 +Subject: [PATCH] modify-augtool-err.patch + +--- + src/get.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/get.c b/src/get.c +index 94b9ba2..64dc5c1 100644 +--- a/src/get.c ++++ b/src/get.c +@@ -455,6 +455,7 @@ static int match(struct state *state, struct lens *lens, + if (count < -1) { + regexp_match_error(state, lens, count, re); + FREE(regs); ++ FREE(re->re); + return -1; + } + state->regs = regs; +-- +2.27.0 + -- Gitee From 6d0aef17ad37ed63af2064e62160d123f2ca711d Mon Sep 17 00:00:00 2001 From: wangkerong Date: Wed, 14 Dec 2022 01:28:17 +0000 Subject: [PATCH 2/2] -amend (cherry picked from commit 3f359199e053617e97324079225cdd8afe785855) --- fix-segment-fault-when-use-augtool.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fix-segment-fault-when-use-augtool.patch b/fix-segment-fault-when-use-augtool.patch index adcf854..1da0b95 100644 --- a/fix-segment-fault-when-use-augtool.patch +++ b/fix-segment-fault-when-use-augtool.patch @@ -1,5 +1,5 @@ From f13e8f91110e1fa3dbd1e053c8f6ffee9e6cdd5d Mon Sep 17 00:00:00 2001 -From: root +From: wangkerong Date: Tue, 10 May 2022 14:35:21 +0800 Subject: [PATCH] modify-augtool-err.patch -- Gitee